From 0bb72348330959d7b736131a0a57e01a42b0ecb4 Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla Date: Fri, 18 Oct 2019 00:33:02 +0100 Subject: [PATCH 06/10] DB845c: Add headset mixer controls Signed-off-by: Srinivas Kandagatla --- src/conf/ucm/DB845c/HiFi | 91 +++++++++++++++++++++++++++------------- 1 file changed, 63 insertions(+), 28 deletions(-) diff --git a/src/conf/ucm/DB845c/HiFi b/src/conf/ucm/DB845c/HiFi index f83213c8..7efd93df 100644 --- a/src/conf/ucm/DB845c/HiFi +++ b/src/conf/ucm/DB845c/HiFi @@ -5,32 +5,23 @@ SectionVerb { EnableSequence [ 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" - cset "name='RX INT8_1 MIX1 INP0' RX0" + cset "name='SLIM RX6 MUX' AIF1_PB" + cset "name='SLIM RX7 MUX' AIF1_PB" + cset "name='RX INT7_1 MIX1 INP0' RX6" + cset "name='RX INT8_1 MIX1 INP0' RX7" ## gain to 0dB - cset "name='RX0 Digital Volume' 68" - cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 1" - 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" + cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" ] DisableSequence [ cdev "hw:DB845c" - cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 0" - cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0" + cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" ] # ALSA PCM Value { # ALSA PCM device for HiFi - PlaybackPCM "hw:DB845c,1" - CapturePCM "hw:DB845c,2" + PlaybackPCM "hw:DB845c,0" } } @@ -39,34 +30,38 @@ SectionDevice."Speakers" { EnableSequence [ 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" - cset "name='RX INT8_1 MIX1 INP0' RX0" - ## gain to 0dB - cset "name='RX0 Digital Volume' 68" - cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 1" + cset "name='SLIM RX6 MUX' AIF1_PB" + cset "name='SLIM RX7 MUX' AIF1_PB" + cset "name='SLIM RX1 MUX' ZERO" + cset "name='SLIM RX2 MUX' ZERO" + cset "name='RX INT7_1 MIX1 INP0' RX6" + cset "name='RX INT8_1 MIX1 INP0' RX7" + cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" cset "name='COMP7 Switch' 1" cset "name='COMP8 Switch' 1" ## Speakers cset "name='SpkrLeft COMP Switch' 1" cset "name='SpkrLeft BOOST Switch' 1" - cset "name='SpkrLeft VISENSE Switch' 1" + cset "name='SpkrLeft DAC Switch' 1" + cset "name='SpkrLeft VISENSE Switch' 0" cset "name='SpkrRight COMP Switch' 1" cset "name='SpkrRight BOOST Switch' 1" - cset "name='SpkrRight VISENSE Switch' 1" + cset "name='SpkrRight DAC Switch' 1" + cset "name='SpkrRight VISENSE Switch' 0" ] DisableSequence [ cdev "hw:DB845c" - cset "name='RX0 Digital Volume' 0" - cset "name='SLIM RX0 MUX' ZERO" + cset "name='SLIM RX6 MUX' ZERO" + cset "name='SLIM RX7 MUX' ZERO" cset "name='COMP7 Switch' 0" cset "name='COMP8 Switch' 0" - cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 0" + cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" + cset "name='SpkrLeft DAC Switch' 0" cset "name='SpkrLeft COMP Switch' 0" cset "name='SpkrLeft BOOST Switch' 0" cset "name='SpkrLeft VISENSE Switch' 0" + cset "name='SpkrRight DAC Switch' 0" cset "name='SpkrRight COMP Switch' 0" cset "name='SpkrRight BOOST Switch' 0" cset "name='SpkrRight VISENSE Switch' 0" @@ -76,3 +71,43 @@ SectionDevice."Speakers" { PlaybackChannels "2" } } + +SectionDevice."HeadPhones" { + Comment "HeadPhones playback" + + EnableSequence [ + cdev "hw:DB845c" + cset "name='SLIM RX1 MUX' AIF1_PB" + cset "name='SLIM RX2 MUX' AIF1_PB" + cset "name='SLIM RX7 MUX' ZERO" + cset "name='SLIM RX6 MUX' ZERO" + cset "name='RX INT1_2 MUX' RX1" + cset "name='RX INT2_2 MUX' RX2" + cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" + cset "name='COMP1 Switch' 1" + cset "name='COMP2 Switch' 1" + cset "name='RX1 Digital Volume' 68" + cset "name='RX2 Digital Volume' 68" + cset "name='RX INT1 DEM MUX' CLSH_DSM_OUT" + cset "name='RX INT2 DEM MUX' CLSH_DSM_OUT" + ] + + DisableSequence [ + cdev "hw:DB845c" + cset "name='SLIM RX1 MUX' ZERO" + cset "name='SLIM RX2 MUX' ZERO" + cset "name='RX INT1_2 MUX' ZERO" + cset "name='RX INT2_2 MUX' ZERO" + cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" + cset "name='COMP1 Switch' 0" + cset "name='COMP2 Switch' 0" + cset "name='RX1 Digital Volume' 68" + cset "name='RX2 Digital Volume' 68" + cset "name='RX INT1 DEM MUX' ZERO" + cset "name='RX INT2 DEM MUX' ZERO" + ] + + Value { + PlaybackChannels "2" + } +} -- 2.24.0