Merge "configs: lahaina: update sva mic mixer paths"
diff --git a/configs/lahaina/sound_trigger_mixer_paths_cdp.xml b/configs/lahaina/sound_trigger_mixer_paths_cdp.xml
index 3f2926a..56a626c 100644
--- a/configs/lahaina/sound_trigger_mixer_paths_cdp.xml
+++ b/configs/lahaina/sound_trigger_mixer_paths_cdp.xml
@@ -53,14 +53,14 @@
<ctl name="VA_AIF1_CAP Mixer DEC5" value="0" />
<ctl name="VA_AIF1_CAP Mixer DEC6" value="0" />
<ctl name="VA_AIF1_CAP Mixer DEC7" value="0" />
- <ctl name="VA DEC0 MUX" value="MSM_DMIC" />
- <ctl name="VA DEC1 MUX" value="MSM_DMIC" />
- <ctl name="VA DEC2 MUX" value="MSM_DMIC" />
- <ctl name="VA DEC3 MUX" value="MSM_DMIC" />
- <ctl name="VA DEC4 MUX" value="MSM_DMIC" />
- <ctl name="VA DEC5 MUX" value="MSM_DMIC" />
- <ctl name="VA DEC6 MUX" value="MSM_DMIC" />
- <ctl name="VA DEC7 MUX" value="MSM_DMIC" />
+ <ctl name="VA DEC0 MUX" value="SWR_MIC" />
+ <ctl name="VA DEC1 MUX" value="SWR_MIC" />
+ <ctl name="VA DEC2 MUX" value="SWR_MIC" />
+ <ctl name="VA DEC3 MUX" value="SWR_MIC" />
+ <ctl name="VA DEC4 MUX" value="SWR_MIC" />
+ <ctl name="VA DEC5 MUX" value="SWR_MIC" />
+ <ctl name="VA DEC6 MUX" value="SWR_MIC" />
+ <ctl name="VA DEC7 MUX" value="SWR_MIC" />
<ctl name="VA DMIC MUX0" value="ZERO" />
<ctl name="VA DMIC MUX1" value="ZERO" />
<ctl name="VA DMIC MUX2" value="ZERO" />
@@ -77,25 +77,37 @@
<ctl name="VA SMIC MUX5" value="ZERO" />
<ctl name="VA SMIC MUX6" value="ZERO" />
<ctl name="VA SMIC MUX7" value="ZERO" />
+ <ctl name="ADC2 MUX" value="ZERO" />
+ <ctl name="ADC3 MUX" value="ZERO" />
+ <ctl name="ADC4 MUX" value="ZERO" />
<ctl name="ADC1_MIXER Switch" value="0" />
<ctl name="ADC2_MIXER Switch" value="0" />
- <ctl name="ADC2 MUX" value="ZERO" />
<ctl name="ADC3_MIXER Switch" value="0" />
- <ctl name="ADC3 MUX" value="ZERO" />
<ctl name="ADC4_MIXER Switch" value="0" />
- <ctl name="ADC4 MUX" value="ZERO" />
- <ctl name="ADC1 Volume" value="0" />
- <ctl name="ADC2 Volume" value="0" />
- <ctl name="ADC3 Volume" value="0" />
- <ctl name="ADC4 Volume" value="0" />
+ <ctl name="ADC1 Volume" value="12" />
+ <ctl name="ADC2 Volume" value="12" />
+ <ctl name="ADC3 Volume" value="12" />
+ <ctl name="ADC4 Volume" value="12" />
<ctl name="AUDIO_REF_EC_UL1 MUX" value="None"/>
<ctl name="EC Reference Channels" value="Zero"/>
<ctl name="EC Reference Bit Format" value="0"/>
<ctl name="EC Reference SampleRate" value="0"/>
<ctl name="LPI Enable" value="0" />
- <ctl name="ADC2 Volume" value="12" />
<ctl name="VA_DEC0 MODE" value="ADC_DEFAULT" />
+ <ctl name="VA_DEC1 MODE" value="ADC_DEFAULT" />
+ <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_INVALID" />
+ <ctl name="TX1 MODE" value="ADC_INVALID" />
+ <ctl name="TX2 MODE" value="ADC_INVALID" />
+ <ctl name="TX3 MODE" value="ADC_INVALID" />
<path name="listen-voice-wakeup-1">
<ctl name="LSM1 Mixer VA_CDC_DMA_TX_0" value="1" />
@@ -260,8 +272,8 @@
<path name="listen-ape-handset-mic">
<ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
<ctl name="VA DEC0 MUX" value="SWR_MIC" />
- <ctl name="VA SMIC MUX0" value="ADC0" />
- <ctl name="ADC1 Volume" value="62" />
+ <ctl name="VA SMIC MUX0" value="SWR_MIC0" />
+ <ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />
<ctl name="ADC1_MIXER Switch" value="1" />
</path>
@@ -274,13 +286,19 @@
<ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
<ctl name="VA_AIF1_CAP Mixer DEC1" value="1" />
<ctl name="VA DEC0 MUX" value="SWR_MIC" />
- <ctl name="VA SMIC MUX0" value="ADC0" />
- <ctl name="ADC1 Volume" value="62" />
- <ctl name="ADC1_MIXER Switch" value="1" />
<ctl name="VA DEC1 MUX" value="SWR_MIC" />
- <ctl name="VA SMIC MUX1" value="ADC1" />
- <ctl name="ADC2_MIXER Switch" value="1" />
+ <ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" />
+ <ctl name="VA_DEC1 MODE" value="ADC_LOW_PWR" />
+ <ctl name="TX0 MODE" value="ADC_LP" />
+ <ctl name="TX1 MODE" value="ADC_LP" />
+ <ctl name="ADC2_BCS Disable" value="1" />
<ctl name="ADC2 MUX" value="INP3" />
+ <ctl name="VA SMIC MUX0" value="SWR_MIC0" />
+ <ctl name="VA SMIC MUX1" value="SWR_MIC1" />
+ <ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />
+ <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
+ <ctl name="ADC1_MIXER Switch" value="1" />
+ <ctl name="ADC2_MIXER Switch" value="1" />
</path>
<path name="listen-ape-handset-tmic">
@@ -289,19 +307,26 @@
<ctl name="VA_AIF1_CAP Mixer DEC1" value="1" />
<ctl name="VA_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="VA DEC0 MUX" value="SWR_MIC" />
- <ctl name="VA SMIC MUX0" value="ADC0" />
- <ctl name="ADC1 Volume" value="62" />
- <ctl name="ADC1_MIXER Switch" value="1" />
<ctl name="VA DEC1 MUX" value="SWR_MIC" />
- <ctl name="VA SMIC MUX1" value="ADC1" />
- <ctl name="ADC2 Volume" value="62" />
- <ctl name="ADC2_MIXER Switch" value="1" />
- <ctl name="ADC2 MUX" value="INP3" />
<ctl name="VA DEC2 MUX" value="SWR_MIC" />
- <ctl name="VA SMIC MUX2" value="ADC2" />
- <ctl name="ADC3 Volume" value="62" />
- <ctl name="ADC3_MIXER Switch" value="1" />
+ <ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" />
+ <ctl name="VA_DEC1 MODE" value="ADC_LOW_PWR" />
+ <ctl name="VA_DEC2 MODE" value="ADC_LOW_PWR" />
+ <ctl name="VA SMIC MUX0" value="SWR_MIC8" />
+ <ctl name="VA SMIC MUX1" value="SWR_MIC9" />
+ <ctl name="VA SMIC MUX2" value="SWR_MIC10" />
+ <ctl name="TX0 MODE" value="ADC_LP" />
+ <ctl name="TX1 MODE" value="ADC_LP" />
+ <ctl name="TX2 MODE" value="ADC_LP" />
+ <ctl name="ADC2_BCS Disable" value="1" />
+ <ctl name="ADC2 MUX" value="INP3" />
<ctl name="ADC3 MUX" value="INP4" />
+ <ctl name="ADC1 ChMap" value="SWRM_TX3_CH1" />
+ <ctl name="ADC2 ChMap" value="SWRM_TX3_CH2" />
+ <ctl name="ADC3 ChMap" value="SWRM_TX3_CH3" />
+ <ctl name="ADC1_MIXER Switch" value="1" />
+ <ctl name="ADC2_MIXER Switch" value="1" />
+ <ctl name="ADC3_MIXER Switch" value="1" />
</path>
<path name="listen-ape-handset-qmic">
@@ -311,34 +336,46 @@
<ctl name="VA_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="VA_AIF1_CAP Mixer DEC3" value="1" />
<ctl name="VA DEC0 MUX" value="SWR_MIC" />
- <ctl name="VA SMIC MUX0" value="ADC0" />
- <ctl name="ADC1 Volume" value="62" />
- <ctl name="ADC1_MIXER Switch" value="1" />
<ctl name="VA DEC1 MUX" value="SWR_MIC" />
- <ctl name="VA SMIC MUX1" value="ADC1" />
- <ctl name="ADC2 Volume" value="62" />
- <ctl name="ADC2_MIXER Switch" value="1" />
- <ctl name="ADC2 MUX" value="INP3" />
<ctl name="VA DEC3 MUX" value="SWR_MIC" />
- <ctl name="VA SMIC MUX3" value="ADC2" />
- <ctl name="ADC3 Volume" value="62" />
- <ctl name="ADC3_MIXER Switch" value="1" />
- <ctl name="ADC3 MUX" value="INP4" />
+ <ctl name="VA_DEC2 MODE" value="ADC_LOW_PWR" />
+ <ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" />
+ <ctl name="VA_DEC1 MODE" value="ADC_LOW_PWR" />
+ <ctl name="VA_DEC3 MODE" value="ADC_LOW_PWR" />
<ctl name="VA DEC2 MUX" value="SWR_MIC" />
- <ctl name="VA SMIC MUX2" value="ADC3" />
- <ctl name="ADC4 Volume" value="62" />
- <ctl name="ADC4_MIXER Switch" value="1" />
+ <ctl name="VA SMIC MUX0" value="SWR_MIC8" />
+ <ctl name="VA SMIC MUX1" value="SWR_MIC9" />
+ <ctl name="VA SMIC MUX3" value="SWR_MIC10" />
+ <ctl name="VA SMIC MUX2" value="SWR_MIC11" />
+ <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="ADC2_BCS Disable" value="1" />
+ <ctl name="ADC2 MUX" value="INP3" />
+ <ctl name="ADC3 MUX" value="INP4" />
<ctl name="ADC4 MUX" value="INP5" />
+ <ctl name="HDR12 MUX" value="NO_HDR12" />
+ <ctl name="HDR34 MUX" value="NO_HDR34" />
+ <ctl name="ADC1 ChMap" value="SWRM_TX3_CH1" />
+ <ctl name="ADC2 ChMap" value="SWRM_TX3_CH2" />
+ <ctl name="ADC3 ChMap" value="SWRM_TX3_CH3" />
+ <ctl name="ADC4 ChMap" value="SWRM_TX3_CH4" />
+ <ctl name="ADC1_MIXER Switch" value="1" />
+ <ctl name="ADC2_MIXER Switch" value="1" />
+ <ctl name="ADC3_MIXER Switch" value="1" />
+ <ctl name="ADC4_MIXER Switch" value="1" />
</path>
<path name="listen-ape-headset-mic">
<ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
<ctl name="VA DEC0 MUX" value="SWR_MIC" />
- <ctl name="VA SMIC MUX0" value="ADC1" />
- <ctl name="ADC2 Volume" value="62" />
+ <ctl name="VA SMIC MUX0" value="SWR_MIC1" />
<ctl name="ADC2_MIXER Switch" value="1" />
<ctl name="ADC2 MUX" value="INP2" />
<ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" />
+ <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
+ <ctl name="HDR12 MUX" value="NO_HDR12" />
</path>
<path name="echo-reference">