hal: set ADC ChMap default control values to corresponding swr tx channel
For dapm powering up sequence from handset dual-mic to headset mic SVA usecase
swrm slave port is not properly enumerated leading to incorrect corresonding
swrm master channel port type.
Change-Id: Ie5d06d497c63951d078b721df156849dc06e4a7f
diff --git a/configs/lahaina/mixer_paths_shimaidp.xml b/configs/lahaina/mixer_paths_shimaidp.xml
index 35ded78..e4340e3 100644
--- a/configs/lahaina/mixer_paths_shimaidp.xml
+++ b/configs/lahaina/mixer_paths_shimaidp.xml
@@ -389,14 +389,15 @@
<ctl name="TX DEC7 MUX" value="SWR_MIC" />
<ctl name="TX DMIC MUX7" value="ZERO" />
<ctl name="TX SMIC MUX7" value="ZERO" />
- <ctl name="ADC1 ChMap" value="ZERO" />
- <ctl name="ADC2 ChMap" value="ZERO" />
- <ctl name="ADC3 ChMap" value="ZERO" />
- <ctl name="ADC4 ChMap" value="ZERO" />
<ctl name="HDR12 MUX" value="NO_HDR12" />
<ctl name="HDR34 MUX" value="NO_HDR34" />
- <ctl name="MBHC ChMap" value="ZERO" />
<ctl name="BCS Channel" value="CH6" />
+ <ctl name="MBHC ChMap" value="SWRM_TX2_CH3" />
+ <ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />
+ <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
+ <ctl name="ADC3 ChMap" value="SWRM_TX2_CH1" />
+ <ctl name="ADC4 ChMap" value="SWRM_TX2_CH2" />
+
<!-- Volume controls -->
<ctl name="WSA_RX0 Digital Volume" value="84" />
@@ -2516,8 +2517,8 @@
<ctl name="TX DEC1 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX1" value="SWR_MIC0" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
- <ctl name="ADC1_MIXER Switch" value="1" />
<ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />
+ <ctl name="ADC1_MIXER Switch" value="1" />
</path>
<path name="amic2">
@@ -2526,9 +2527,9 @@
<ctl name="TX_CDC_DMA_TX_4 Channels" value="One" />
<ctl name="DEC0_BCS Switch" value="1" />
<ctl name="TX_AIF2_CAP Mixer DEC0" value="1" />
+ <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
<ctl name="ADC2_MIXER Switch" value="1" />
<ctl name="ADC2 MUX" value="INP2" />
- <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
<ctl name="MBHC ChMap" value="SWRM_TX2_CH3" />
<ctl name="BCS Channel" value="CH6" />
<ctl name="HDR12 MUX" value="NO_HDR12" />
@@ -2538,9 +2539,9 @@
<ctl name="TX DEC1 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX1" value="SWR_MIC1" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
+ <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
<ctl name="ADC2_MIXER Switch" value="1" />
<ctl name="ADC2 MUX" value="INP3" />
- <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
<ctl name="HDR12 MUX" value="NO_HDR12" />
</path>
@@ -2548,9 +2549,9 @@
<ctl name="TX DEC1 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX1" value="SWR_MIC4" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
+ <ctl name="ADC3 ChMap" value="SWRM_TX2_CH1" />
<ctl name="ADC3_MIXER Switch" value="1" />
<ctl name="ADC3 MUX" value="INP4" />
- <ctl name="ADC3 ChMap" value="SWRM_TX2_CH1" />
<ctl name="HDR34 MUX" value="NO_HDR34" />
</path>
@@ -2558,9 +2559,9 @@
<ctl name="TX DEC1 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX1" value="SWR_MIC5" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
+ <ctl name="ADC4 ChMap" value="SWRM_TX2_CH2" />
<ctl name="ADC4_MIXER Switch" value="1" />
<ctl name="ADC4 MUX" value="INP5" />
- <ctl name="ADC4 ChMap" value="SWRM_TX2_CH2" />
</path>
<path name="speaker">
@@ -2965,11 +2966,11 @@
<ctl name="TX SMIC MUX2" value="SWR_MIC1" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
- <ctl name="ADC1_MIXER Switch" value="1" />
<ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />
+ <ctl name="ADC1_MIXER Switch" value="1" />
+ <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
<ctl name="ADC2_MIXER Switch" value="1" />
<ctl name="ADC2 MUX" value="INP3" />
- <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
<ctl name="HDR12 MUX" value="NO_HDR12" />
</path>
@@ -2978,16 +2979,16 @@
<ctl name="TX DEC1 MUX" value="SWR_MIC" />
<ctl name="TX DEC2 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX1" value="SWR_MIC1" />
- <ctl name="TX SMIC MUX2" value="SWR_MIC9" />
+ <ctl name="TX SMIC MUX2" value="SWR_MIC5" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+ <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
<ctl name="ADC2_MIXER Switch" value="1" />
<ctl name="ADC2 MUX" value="INP3" />
- <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
<ctl name="HDR12 MUX" value="NO_HDR12" />
+ <ctl name="ADC4 ChMap" value="SWRM_TX2_CH2" />
<ctl name="ADC4_MIXER Switch" value="1" />
<ctl name="ADC4 MUX" value="INP5" />
- <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
</path>
<path name="dmic-endfire">
@@ -3060,14 +3061,14 @@
<ctl name="TX DEC1 MUX" value="SWR_MIC" />
<ctl name="TX DEC2 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX1" value="SWR_MIC0" />
- <ctl name="TX SMIC MUX2" value="SWR_MIC9" />
+ <ctl name="TX SMIC MUX2" value="SWR_MIC5" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
- <ctl name="ADC1_MIXER Switch" value="1" />
<ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />
+ <ctl name="ADC1_MIXER Switch" value="1" />
+ <ctl name="ADC4 ChMap" value="SWRM_TX2_CH2" />
<ctl name="ADC4_MIXER Switch" value="1" />
<ctl name="ADC4 MUX" value="INP5" />
- <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
</path>
<path name="dmic-broadside">
@@ -3088,16 +3089,16 @@
<ctl name="TX DEC1 MUX" value="SWR_MIC" />
<ctl name="TX DEC2 MUX" value="SWR_MIC" />
<ctl name="TX DEC3 MUX" value="SWR_MIC" />
- <ctl name="TX SMIC MUX1" value="SWR_MIC9" />
+ <ctl name="TX SMIC MUX1" value="SWR_MIC5" />
<ctl name="TX SMIC MUX2" value="SWR_MIC0" />
- <ctl name="TX SMIC MUX3" value="SWR_MIC8" />
+ <ctl name="TX SMIC MUX3" value="SWR_MIC4" />
<ctl name="ADC4 MUX" value="INP5" />
<ctl name="ADC3 MUX" value="INP4" />
<ctl name="HDR12 MUX" value="NO_HDR12" />
<ctl name="HDR34 MUX" value="NO_HDR34" />
<ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />
- <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" />
- <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
+ <ctl name="ADC3 ChMap" value="SWRM_TX2_CH1" />
+ <ctl name="ADC4 ChMap" value="SWRM_TX2_CH2" />
<ctl name="ADC1_MIXER Switch" value="1" />
<ctl name="ADC3_MIXER Switch" value="1" />
<ctl name="ADC4_MIXER Switch" value="1" />
@@ -3122,9 +3123,9 @@
<ctl name="TX DEC2 MUX" value="SWR_MIC" />
<ctl name="TX DEC3 MUX" value="SWR_MIC" />
<ctl name="TX DEC4 MUX" value="SWR_MIC" />
- <ctl name="TX SMIC MUX1" value="SWR_MIC9" />
+ <ctl name="TX SMIC MUX1" value="SWR_MIC5" />
<ctl name="TX SMIC MUX2" value="SWR_MIC0" />
- <ctl name="TX SMIC MUX3" value="SWR_MIC8" />
+ <ctl name="TX SMIC MUX3" value="SWR_MIC4" />
<ctl name="TX SMIC MUX4" value="SWR_MIC1" />
<ctl name="ADC2 MUX" value="INP3" />
<ctl name="ADC3 MUX" value="INP4" />
@@ -3133,8 +3134,8 @@
<ctl name="HDR34 MUX" value="NO_HDR34" />
<ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />
<ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
- <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" />
- <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
+ <ctl name="ADC3 ChMap" value="SWRM_TX2_CH1" />
+ <ctl name="ADC4 ChMap" value="SWRM_TX2_CH2" />
<ctl name="ADC1_MIXER Switch" value="1" />
<ctl name="ADC2_MIXER Switch" value="1" />
<ctl name="ADC3_MIXER Switch" value="1" />
@@ -3213,9 +3214,9 @@
<ctl name="TX SMIC MUX6" value="SWR_MIC1" />
<ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
<ctl name="TX_AIF1_CAP Mixer DEC6" value="1" />
+ <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
<ctl name="ADC2_MIXER Switch" value="1" />
<ctl name="ADC2 MUX" value="INP2" />
- <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
<ctl name="HDR12 MUX" value="NO_HDR12" />
</path>
diff --git a/configs/lahaina/sound_trigger_mixer_paths_shimaidp.xml b/configs/lahaina/sound_trigger_mixer_paths_shimaidp.xml
index 5de527e..0e1739f 100644
--- a/configs/lahaina/sound_trigger_mixer_paths_shimaidp.xml
+++ b/configs/lahaina/sound_trigger_mixer_paths_shimaidp.xml
@@ -98,16 +98,16 @@
<ctl name="VA_DEC2 MODE" value="ADC_DEFAULT" />
<ctl name="VA_DEC3 MODE" value="ADC_DEFAULT" />
<ctl name="ADC2_BCS Disable" value="0" />
- <ctl name="ADC1 ChMap" value="ZERO" />
- <ctl name="ADC2 ChMap" value="ZERO" />
- <ctl name="ADC3 ChMap" value="ZERO" />
- <ctl name="ADC4 ChMap" value="ZERO" />
<ctl name="HDR12 MUX" value="NO_HDR12" />
<ctl name="HDR34 MUX" value="NO_HDR34" />
<ctl name="TX0 MODE" value="ADC_LP" />
<ctl name="TX1 MODE" value="ADC_LP" />
<ctl name="TX2 MODE" value="ADC_LP" />
<ctl name="TX3 MODE" value="ADC_LP" />
+ <ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />
+ <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
+ <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" />
+ <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
<path name="listen-voice-wakeup-1">
<ctl name="LSM1 Mixer VA_CDC_DMA_TX_0" value="1" />
@@ -259,8 +259,8 @@
<ctl name="VA DEC0 MUX" value="SWR_MIC" />
<ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" />
<ctl name="VA SMIC MUX0" value="SWR_MIC0" />
- <ctl name="ADC1_MIXER Switch" value="1" />
<ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />
+ <ctl name="ADC1_MIXER Switch" value="1" />
</path>
<path name="listen-ape-handset-mic-preproc">
@@ -274,15 +274,15 @@
<ctl name="VA DEC0 MUX" value="SWR_MIC" />
<ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" />
<ctl name="VA SMIC MUX0" value="SWR_MIC0" />
+ <ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />
<ctl name="ADC1_MIXER Switch" value="1" />
<ctl name="VA DEC1 MUX" value="SWR_MIC" />
<ctl name="VA_DEC1 MODE" value="ADC_LOW_PWR" />
<ctl name="VA SMIC MUX1" value="SWR_MIC1" />
+ <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
<ctl name="ADC2_MIXER Switch" value="1" />
<ctl name="ADC2 MUX" value="INP3" />
<ctl name="HDR12 MUX" value="NO_HDR12" />
- <ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />
- <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
</path>
<path name="listen-ape-handset-tmic">
@@ -304,10 +304,10 @@
<ctl name="HDR12 MUX" value="NO_HDR12" />
<ctl name="HDR34 MUX" value="NO_HDR34" />
<ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />
- <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" />
- <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
<ctl name="ADC1_MIXER Switch" value="1" />
+ <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" />
<ctl name="ADC3_MIXER Switch" value="1" />
+ <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
<ctl name="ADC4_MIXER Switch" value="1" />
</path>
@@ -336,12 +336,12 @@
<ctl name="HDR12 MUX" value="NO_HDR12" />
<ctl name="HDR34 MUX" value="NO_HDR34" />
<ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />
- <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
- <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" />
- <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
<ctl name="ADC1_MIXER Switch" value="1" />
+ <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
<ctl name="ADC2_MIXER Switch" value="1" />
+ <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" />
<ctl name="ADC3_MIXER Switch" value="1" />
+ <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
<ctl name="ADC4_MIXER Switch" value="1" />
</path>
@@ -350,11 +350,11 @@
<ctl name="VA DEC0 MUX" value="SWR_MIC" />
<ctl name="VA SMIC MUX0" value="SWR_MIC1" />
<ctl name="VA_CDC_DMA_TX_0 Channels" value="One" />
+ <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
<ctl name="ADC2_MIXER Switch" value="1" />
<ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" />
<ctl name="ADC2 MUX" value="INP2" />
<ctl name="HDR12 MUX" value="NO_HDR12" />
- <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
<ctl name="ADC2_BCS Disable" value="1" />
</path>