Merge "configs: enable codec switches at the end"
diff --git a/configs/lahaina/mixer_paths.xml b/configs/lahaina/mixer_paths.xml
index 8a6389d..82caaa6 100644
--- a/configs/lahaina/mixer_paths.xml
+++ b/configs/lahaina/mixer_paths.xml
@@ -340,9 +340,15 @@
<ctl name="DSD_R Switch" value="0" />
<!-- TX Controls -->
+ <!-- Enable these switches at the end of a path -->
+ <ctl name="ADC2_MIXER Switch" value="0" />
+ <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="0" />
+ <ctl name="SWR_MIC1 SWR_DMIC_MIXER Switch" value="0" />
+ <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="0" />
+ <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="0" />
+
<ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
<ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_3" value="0" />
- <ctl name="ADC2_MIXER Switch" value="0" />
<ctl name="ADC2 MUX" value="ZERO" />
<ctl name="DEC0_BCS Switch" value="0" />
<ctl name="TX_AIF1_CAP Mixer DEC0" value="0" />
@@ -377,6 +383,10 @@
<ctl name="TX DEC7 MUX" value="SWR_MIC" />
<ctl name="TX DMIC MUX7" value="ZERO" />
<ctl name="TX SMIC MUX7" value="ZERO" />
+ <ctl name="SWR_MIC0 HIFI PortMap" value="ZERO" />
+ <ctl name="SWR_MIC1 HIFI PortMap" value="ZERO" />
+ <ctl name="SWR_MIC2 HIFI PortMap" value="ZERO" />
+ <ctl name="SWR_MIC3 HIFI PortMap" value="ZERO" />
<!-- Volume controls -->
<ctl name="WSA_RX0 Digital Volume" value="84" />
@@ -2409,12 +2419,12 @@
<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_MIXER Switch" value="1" />
<ctl name="ADC2 MUX" value="INP2" />
<ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
<ctl name="MBHC ChMap" value="SWRM_TX1_CH3" />
<ctl name="BCS Channel" value="CH2" />
<ctl name="HDR12 MUX" value="NO_HDR12" />
+ <ctl name="ADC2_MIXER Switch" value="1" />
</path>
<path name="dmic1">
@@ -2422,8 +2432,8 @@
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="TX DEC2 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX2" value="SWR_MIC0" />
- <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX1_CH1" />
+ <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
</path>
<path name="dmic2">
@@ -2431,8 +2441,8 @@
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="TX DEC2 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX2" value="SWR_MIC1" />
- <ctl name="SWR_MIC1 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC1 HIFI PortMap" value="SWRM_TX1_CH2" />
+ <ctl name="SWR_MIC1 SWR_DMIC_MIXER Switch" value="1" />
</path>
<path name="dmic3">
@@ -2440,8 +2450,8 @@
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="TX DEC2 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX2" value="SWR_MIC2" />
- <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC2 HIFI PortMap" value="SWRM_TX1_CH3" />
+ <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />
</path>
<path name="dmic4">
@@ -2449,8 +2459,8 @@
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="TX DEC2 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX2" value="SWR_MIC3" />
- <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX1_CH4" />
+ <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
</path>
<path name="speaker">
@@ -2902,10 +2912,10 @@
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="TX DEC2 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX2" value="SWR_MIC0" />
- <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX1_CH1" />
- <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC2 HIFI PortMap" value="SWRM_TX1_CH3" />
+ <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />
</path>
<path name="speaker-dmic-endfire">
@@ -2916,10 +2926,10 @@
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
<ctl name="TX DEC1 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX1" value="SWR_MIC0" />
- <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX1_CH4" />
- <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX1_CH1" />
+ <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
</path>
<path name="dmic-endfire">
@@ -2995,10 +3005,10 @@
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
<ctl name="TX DEC2 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX2" value="SWR_MIC0" />
- <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX1_CH4" />
- <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX1_CH1" />
+ <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
</path>
<path name="dmic-broadside">
@@ -3022,12 +3032,12 @@
<ctl name="TX SMIC MUX1" value="SWR_MIC11" />
<ctl name="TX SMIC MUX2" value="SWR_MIC8" />
<ctl name="TX SMIC MUX3" value="SWR_MIC10" />
- <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
- <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
- <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX3_CH4" />
<ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX3_CH1" />
<ctl name="SWR_MIC2 HIFI PortMap" value="SWRM_TX3_CH3" />
+ <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />
</path>
<path name="speaker-tmic">
@@ -3041,12 +3051,12 @@
<ctl name="TX SMIC MUX1" value="SWR_MIC11" />
<ctl name="TX SMIC MUX2" value="SWR_MIC8" />
<ctl name="TX SMIC MUX3" value="SWR_MIC10" />
- <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
- <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
- <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX3_CH4" />
<ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX3_CH1" />
<ctl name="SWR_MIC2 HIFI PortMap" value="SWRM_TX3_CH3" />
+ <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />
</path>
<path name="voice-speaker-tmic">
@@ -3068,14 +3078,14 @@
<ctl name="TX SMIC MUX2" value="SWR_MIC8" />
<ctl name="TX SMIC MUX3" value="SWR_MIC10" />
<ctl name="TX SMIC MUX4" value="SWR_MIC9" />
- <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
- <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
- <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />
- <ctl name="SWR_MIC1 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX3_CH4" />
<ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX3_CH1" />
<ctl name="SWR_MIC2 HIFI PortMap" value="SWRM_TX3_CH3" />
<ctl name="SWR_MIC1 HIFI PortMap" value="SWRM_TX3_CH2" />
+ <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC1 SWR_DMIC_MIXER Switch" value="1" />
</path>
<path name="speaker-qmic-liquid">
@@ -3150,10 +3160,10 @@
<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_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" />
+ <ctl name="ADC2_MIXER Switch" value="1" />
</path>
<path name="voice-tty-vco-handset-mic">
diff --git a/configs/lahaina/mixer_paths_cdp.xml b/configs/lahaina/mixer_paths_cdp.xml
index 63a3b4f..789c6a0 100644
--- a/configs/lahaina/mixer_paths_cdp.xml
+++ b/configs/lahaina/mixer_paths_cdp.xml
@@ -327,15 +327,21 @@
<ctl name="DSD_R Switch" value="0" />
<!-- TX Controls -->
- <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
- <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_3" value="0" />
+ <!-- Enable these switches at the end of a path -->
<ctl name="ADC1_MIXER Switch" value="0" />
<ctl name="ADC2_MIXER Switch" value="0" />
+ <ctl name="ADC3_MIXER Switch" value="0" />
+ <ctl name="ADC4_MIXER Switch" value="0" />
+ <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="0" />
+ <ctl name="SWR_MIC1 SWR_DMIC_MIXER Switch" value="0" />
+ <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="0" />
+ <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="0" />
+
+ <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
+ <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_3" value="0" />
<ctl name="ADC2 MUX" value="ZERO" />
<ctl name="DEC0_BCS Switch" value="0" />
- <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="TX_AIF1_CAP Mixer DEC0" value="0" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="0" />
@@ -379,10 +385,6 @@
<ctl name="SWR_MIC1 HIFI PortMap" value="ZERO" />
<ctl name="SWR_MIC2 HIFI PortMap" value="ZERO" />
<ctl name="SWR_MIC3 HIFI PortMap" value="ZERO" />
- <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="0" />
- <ctl name="SWR_MIC1 SWR_DMIC_MIXER Switch" value="0" />
- <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="0" />
- <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="0" />
<!-- Volume controls -->
<ctl name="WSA_RX0 Digital Volume" value="84" />
@@ -2275,41 +2277,41 @@
<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_MIXER Switch" value="1" />
<ctl name="ADC2 MUX" value="INP2" />
<ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
<ctl name="MBHC ChMap" value="SWRM_TX1_CH3" />
<ctl name="BCS Channel" value="CH2" />
<ctl name="HDR12 MUX" value="NO_HDR12" />
+ <ctl name="ADC2_MIXER Switch" value="1" />
</path>
<path name="amic3">
<ctl name="TX DEC2 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX2" value="SWR_MIC1" />
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
- <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="ADC2_MIXER Switch" value="1" />
</path>
<path name="amic4">
<ctl name="TX DEC5 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX5" value="SWR_MIC2" />
<ctl name="TX_AIF1_CAP Mixer DEC5" value="1" />
- <ctl name="ADC3_MIXER Switch" value="1" />
<ctl name="ADC3 MUX" value="INP4" />
<ctl name="ADC3 ChMap" value="SWRM_TX1_CH3" />
<ctl name="HDR34 MUX" value="NO_HDR34" />
+ <ctl name="ADC3_MIXER Switch" value="1" />
</path>
<path name="amic5">
<ctl name="TX DEC3 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX3" value="SWR_MIC3" />
<ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
- <ctl name="ADC4_MIXER Switch" value="1" />
- <ctl name="ADC4 MUX" value="INP5" />
<ctl name="ADC4 ChMap" value="SWRM_TX1_CH4" />
+ <ctl name="ADC4 MUX" value="INP5" />
+ <ctl name="ADC4_MIXER Switch" value="1" />
</path>
<path name="dmic1">
@@ -2317,8 +2319,8 @@
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="TX DEC2 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX2" value="SWR_MIC0" />
- <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX1_CH1" />
+ <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
</path>
<path name="dmic2">
@@ -2326,8 +2328,8 @@
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="TX DEC2 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX2" value="SWR_MIC1" />
- <ctl name="SWR_MIC1 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC1 HIFI PortMap" value="SWRM_TX1_CH2" />
+ <ctl name="SWR_MIC1 SWR_DMIC_MIXER Switch" value="1" />
</path>
<path name="dmic3">
@@ -2335,8 +2337,8 @@
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="TX DEC2 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX2" value="SWR_MIC2" />
- <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC2 HIFI PortMap" value="SWRM_TX1_CH3" />
+ <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />
</path>
<path name="dmic4">
@@ -2344,8 +2346,8 @@
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="TX DEC2 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX2" value="SWR_MIC3" />
- <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX1_CH4" />
+ <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
</path>
<path name="speaker">
@@ -2793,10 +2795,10 @@
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="TX DEC2 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX2" value="SWR_MIC2" />
- <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX1_CH1" />
- <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC2 HIFI PortMap" value="SWRM_TX1_CH3" />
+ <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />
</path>
<path name="speaker-dmic-endfire">
@@ -2807,10 +2809,10 @@
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
<ctl name="TX DEC1 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX1" value="SWR_MIC0" />
- <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX1_CH4" />
- <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX1_CH1" />
+ <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
</path>
<path name="dmic-endfire">
@@ -2886,10 +2888,10 @@
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
<ctl name="TX DEC2 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX2" value="SWR_MIC0" />
- <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX1_CH4" />
- <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX1_CH1" />
+ <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
</path>
<path name="dmic-broadside">
@@ -2913,12 +2915,12 @@
<ctl name="TX SMIC MUX1" value="SWR_MIC11" />
<ctl name="TX SMIC MUX2" value="SWR_MIC8" />
<ctl name="TX SMIC MUX3" value="SWR_MIC10" />
- <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
- <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
- <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX3_CH4" />
<ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX3_CH1" />
<ctl name="SWR_MIC2 HIFI PortMap" value="SWRM_TX3_CH3" />
+ <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />
</path>
<path name="speaker-tmic">
@@ -2944,14 +2946,14 @@
<ctl name="TX SMIC MUX2" value="SWR_MIC8" />
<ctl name="TX SMIC MUX3" value="SWR_MIC10" />
<ctl name="TX SMIC MUX4" value="SWR_MIC9" />
- <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
- <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
- <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />
- <ctl name="SWR_MIC1 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX3_CH4" />
<ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX3_CH1" />
<ctl name="SWR_MIC2 HIFI PortMap" value="SWRM_TX3_CH3" />
<ctl name="SWR_MIC1 HIFI PortMap" value="SWRM_TX3_CH2" />
+ <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC1 SWR_DMIC_MIXER Switch" value="1" />
</path>
<path name="speaker-qmic-liquid">
diff --git a/configs/lahaina/mixer_paths_qrd.xml b/configs/lahaina/mixer_paths_qrd.xml
index 19284f4..ff3d0f9 100644
--- a/configs/lahaina/mixer_paths_qrd.xml
+++ b/configs/lahaina/mixer_paths_qrd.xml
@@ -340,9 +340,12 @@
<ctl name="DSD_R Switch" value="0" />
<!-- TX Controls -->
+ <!-- Enable these switches at the end of a path -->
+ <ctl name="ADC1_MIXER Switch" value="0" />
+ <ctl name="ADC2_MIXER Switch" value="0" />
+
<ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
<ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_3" value="0" />
- <ctl name="ADC2_MIXER Switch" value="0" />
<ctl name="ADC2 MUX" value="ZERO" />
<ctl name="DEC0_BCS Switch" value="0" />
<ctl name="TX_AIF1_CAP Mixer DEC0" value="0" />
@@ -2405,9 +2408,10 @@
<!-- These are actual sound device specific mixer settings -->
<path name="amic1">
<ctl name="TX DEC2 MUX" value="SWR_MIC" />
- <ctl name="TX SMIC MUX2" value="ADC0" />
+ <ctl name="TX SMIC MUX2" value="SWR_MIC0" />
<ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+ <ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />
<ctl name="ADC1_MIXER Switch" value="1" />
</path>
@@ -2417,22 +2421,24 @@
<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_MIXER Switch" value="1" />
<ctl name="ADC2 MUX" value="INP2" />
<ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
<ctl name="MBHC ChMap" value="SWRM_TX1_CH3" />
<ctl name="BCS Channel" value="CH2" />
<ctl name="HDR12 MUX" value="NO_HDR12" />
+ <ctl name="ADC2_MIXER Switch" value="1" />
</path>
<path name="amic3">
- <ctl name="TX DEC2 MUX" value="SWR_MIC" />
- <ctl name="TX SMIC MUX2" value="ADC2" />
<ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
+ <ctl name="TX DEC2 MUX" value="SWR_MIC" />
+ <ctl name="TX SMIC MUX2" value="SWR_MIC1" />
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
- <ctl name="ADC2_MIXER Switch" value="1" />
+ <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
<ctl name="ADC2 MUX" value="INP3" />
+ <ctl name="HDR12 MUX" value="NO_HDR12" />
+ <ctl name="ADC2_MIXER Switch" value="1" />
</path>
<path name="dmic1">
@@ -3128,8 +3134,8 @@
<ctl name="TX SMIC MUX6" value="ADC1" />
<ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
<ctl name="TX_AIF1_CAP Mixer DEC6" value="1" />
- <ctl name="ADC2_MIXER Switch" value="1" />
<ctl name="ADC2 MUX" value="INP2" />
+ <ctl name="ADC2_MIXER Switch" value="1" />
</path>
<path name="voice-tty-vco-handset-mic">
@@ -3662,5 +3668,4 @@
<path name="incall_music_uplink2" />
</path>
-
</mixer>
diff --git a/configs/lahaina/sound_trigger_mixer_paths.xml b/configs/lahaina/sound_trigger_mixer_paths.xml
index b229d65..3604b63 100644
--- a/configs/lahaina/sound_trigger_mixer_paths.xml
+++ b/configs/lahaina/sound_trigger_mixer_paths.xml
@@ -244,8 +244,8 @@
<ctl name="VA DEC0 MUX" value="SWR_MIC" />
<ctl name="VA SMIC MUX0" value="SWR_MIC11" />
<ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX3_CH4" />
- <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="VA_DEC0 Volume" value="99" />
+ <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
</path>
<path name="listen-ape-handset-mic-preproc">
@@ -262,10 +262,10 @@
<ctl name="VA SMIC MUX1" value="SWR_MIC8" />
<ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX3_CH4" />
<ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX3_CH1" />
- <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
- <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="VA_DEC0 Volume" value="99" />
<ctl name="VA_DEC1 Volume" value="99" />
+ <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
</path>
<path name="listen-ape-handset-tmic">
@@ -282,12 +282,12 @@
<ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX3_CH4" />
<ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX3_CH1" />
<ctl name="SWR_MIC1 HIFI PortMap" value="SWRM_TX3_CH2" />
- <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
- <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
- <ctl name="SWR_MIC1 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="VA_DEC0 Volume" value="99" />
<ctl name="VA_DEC1 Volume" value="99" />
<ctl name="VA_DEC2 Volume" value="99" />
+ <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC1 SWR_DMIC_MIXER Switch" value="1" />
</path>
<path name="listen-ape-handset-qmic">
@@ -308,14 +308,14 @@
<ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX3_CH1" />
<ctl name="SWR_MIC1 HIFI PortMap" value="SWRM_TX3_CH2" />
<ctl name="SWR_MIC2 HIFI PortMap" value="SWRM_TX3_CH3" />
- <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
- <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
- <ctl name="SWR_MIC1 SWR_DMIC_MIXER Switch" value="1" />
- <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />
<ctl name="VA_DEC0 Volume" value="99" />
<ctl name="VA_DEC1 Volume" value="99" />
<ctl name="VA_DEC2 Volume" value="99" />
<ctl name="VA_DEC3 Volume" value="99" />
+ <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC1 SWR_DMIC_MIXER Switch" value="1" />
+ <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />
</path>
<path name="listen-ape-headset-mic">
diff --git a/configs/lahaina/sound_trigger_mixer_paths_cdp.xml b/configs/lahaina/sound_trigger_mixer_paths_cdp.xml
index 56a626c..1a3f578 100644
--- a/configs/lahaina/sound_trigger_mixer_paths_cdp.xml
+++ b/configs/lahaina/sound_trigger_mixer_paths_cdp.xml
@@ -371,11 +371,11 @@
<ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
<ctl name="VA DEC0 MUX" value="SWR_MIC" />
<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" />
+ <ctl name="ADC2_MIXER Switch" value="1" />
</path>
<path name="echo-reference">
diff --git a/configs/lahaina/sound_trigger_mixer_paths_qrd.xml b/configs/lahaina/sound_trigger_mixer_paths_qrd.xml
index 1bf1a85..ee65a81 100644
--- a/configs/lahaina/sound_trigger_mixer_paths_qrd.xml
+++ b/configs/lahaina/sound_trigger_mixer_paths_qrd.xml
@@ -300,9 +300,9 @@
<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_MIXER Switch" value="1" />
<ctl name="ADC2 MUX" value="INP2" />
<ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" />
+ <ctl name="ADC2_MIXER Switch" value="1" />
</path>
<path name="echo-reference">