From d49db4501231b9b6a536cf3a0a949048ff6bd531 Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla Date: Fri, 20 Sep 2019 13:12:05 +0100 Subject: [PATCH 04/10] WIP: make card name explicit Signed-off-by: Srinivas Kandagatla --- ucm2/DB845c/DB845c.conf | 2 +- ucm2/DB845c/HDMI | 10 ++-- ucm2/DB845c/HiFi | 124 ++-------------------------------------- 3 files changed, 12 insertions(+), 124 deletions(-) diff --git a/ucm2/DB845c/DB845c.conf b/ucm2/DB845c/DB845c.conf index c4f958e..d3cf0b7 100644 --- a/ucm2/DB845c/DB845c.conf +++ b/ucm2/DB845c/DB845c.conf @@ -9,7 +9,7 @@ SectionUseCase."HDMI" { } SectionDefaults [ - cdev "hw:0" + cdev "hw:DB845c" cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 1" cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 1" cset "name='SLIM RX0 MUX' AIF1_PB" diff --git a/ucm2/DB845c/HDMI b/ucm2/DB845c/HDMI index 8354033..435e6d8 100644 --- a/ucm2/DB845c/HDMI +++ b/ucm2/DB845c/HDMI @@ -3,17 +3,17 @@ SectionVerb { EnableSequence [ - cdev "hw:0" + cdev "hw:DB845c" cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 1" ] DisableSequence [ - cdev "hw:0" + cdev "hw:DB845c" cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 0" ] Value { TQ "HiFi" - PlaybackPCM "hw:0,0" + PlaybackPCM "hw:DB845c,0" } } @@ -22,12 +22,12 @@ SectionDevice."HDMI-stereo" { Comment "HDMI Digital Stereo Output" EnableSequence [ - cdev "hw:0" + cdev "hw:DB845c" cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 1" ] DisableSequence [ - cdev "hw:0" + cdev "hw:DB845c" cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 0" ] diff --git a/ucm2/DB845c/HiFi b/ucm2/DB845c/HiFi index e8ede5b..f83213c 100644 --- a/ucm2/DB845c/HiFi +++ b/ucm2/DB845c/HiFi @@ -4,7 +4,7 @@ SectionVerb { EnableSequence [ - cdev "hw:0" + cdev "hw:DB845c" cset "name='SLIM RX0 MUX' AIF1_PB" cset "name='CDC_IF RX0 MUX' SLIM RX0" cset "name='RX INT7_1 MIX1 INP0' RX0" @@ -21,7 +21,7 @@ SectionVerb { ] DisableSequence [ - cdev "hw:0" + cdev "hw:DB845c" cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 0" cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0" ] @@ -29,8 +29,8 @@ SectionVerb { # ALSA PCM Value { # ALSA PCM device for HiFi - PlaybackPCM "hw:0,1" - CapturePCM "hw:0,2" + PlaybackPCM "hw:DB845c,1" + CapturePCM "hw:DB845c,2" } } @@ -38,7 +38,7 @@ SectionDevice."Speakers" { Comment "Speakers playback" EnableSequence [ - cdev "hw:0" + cdev "hw:DB845c" cset "name='SLIM RX0 MUX' AIF1_PB" cset "name='CDC_IF RX0 MUX' SLIM RX0" cset "name='RX INT7_1 MIX1 INP0' RX0" @@ -58,7 +58,7 @@ SectionDevice."Speakers" { ] DisableSequence [ - cdev "hw:0" + cdev "hw:DB845c" cset "name='RX0 Digital Volume' 0" cset "name='SLIM RX0 MUX' ZERO" cset "name='COMP7 Switch' 0" @@ -76,115 +76,3 @@ SectionDevice."Speakers" { PlaybackChannels "2" } } - -SectionDevice."DMIC0" { - Comment "Digital Microphone0" - - EnableSequence [ - cdev "hw:0" - cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1" - cset "name='AIF1_CAP Mixer SLIM TX0' 1" - cset "name='CDC_IF TX0 MUX' DEC0" - cset "name='ADC MUX0' DMIC" - cset "name='DMIC MUX0' DMIC0" - cset "name='DEC0 Volume' 68" - ] - - DisableSequence [ - cdev "hw:0" - cset "name='AIF1_CAP Mixer SLIM TX0' 0" - cset "name='CDC_IF TX0 MUX' ZERO" - cset "name='ADC MUX0' ZERO" - cset "name='DMIC MUX0' ZERO" - cset "name='DEC0 Volume' 0" - cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0" - ] - - Value { - CaptureChannels "1" - } -} - -SectionDevice."DMIC1" { - Comment "Digital Microphone1" - - EnableSequence [ - cdev "hw:0" - cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1" - cset "name='AIF1_CAP Mixer SLIM TX0' 1" - cset "name='CDC_IF TX0 MUX' DEC0" - cset "name='ADC MUX0' DMIC" - cset "name='DMIC MUX0' DMIC1" - cset "name='DEC0 Volume' 68" - ] - - DisableSequence [ - cdev "hw:0" - cset "name='AIF1_CAP Mixer SLIM TX0' 0" - cset "name='CDC_IF TX0 MUX' ZERO" - cset "name='ADC MUX0' ZERO" - cset "name='DMIC MUX0' ZERO" - cset "name='DEC0 Volume' 0" - cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0" - ] - - Value { - CaptureChannels "1" - } -} - -SectionDevice."DMIC2" { - Comment "Digital Microphone0" - - EnableSequence [ - cdev "hw:0" - cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1" - cset "name='AIF1_CAP Mixer SLIM TX0' 1" - cset "name='CDC_IF TX0 MUX' DEC0" - cset "name='ADC MUX0' DMIC" - cset "name='DMIC MUX0' DMIC2" - cset "name='DEC0 Volume' 68" - ] - - DisableSequence [ - cdev "hw:0" - cset "name='AIF1_CAP Mixer SLIM TX0' 0" - cset "name='CDC_IF TX0 MUX' ZERO" - cset "name='ADC MUX0' ZERO" - cset "name='DMIC MUX0' ZERO" - cset "name='DEC0 Volume' 0" - cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0" - ] - - Value { - CaptureChannels "1" - } -} - -SectionDevice."DMIC4" { - Comment "Digital Microphone0" - - EnableSequence [ - cdev "hw:0" - cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1" - cset "name='AIF1_CAP Mixer SLIM TX0' 1" - cset "name='CDC_IF TX0 MUX' DEC0" - cset "name='ADC MUX0' DMIC" - cset "name='DMIC MUX0' DMIC3" - cset "name='DEC0 Volume' 68" - ] - - DisableSequence [ - cdev "hw:0" - cset "name='AIF1_CAP Mixer SLIM TX0' 0" - cset "name='CDC_IF TX0 MUX' ZERO" - cset "name='ADC MUX0' ZERO" - cset "name='DMIC MUX0' ZERO" - cset "name='DEC0 Volume' 0" - cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0" - ] - - Value { - CaptureChannels "1" - } -} -- 2.20.1