configs: update channel order for multi mic usecases
For multi mic usecases, update the channel order
in which mics are connected.
Change-Id: I58f93ca12a7ffb489bbd92118e3bd80b9ca819b8
diff --git a/configs/lahaina/mixer_paths.xml b/configs/lahaina/mixer_paths.xml
index ab97935..2fc641e 100644
--- a/configs/lahaina/mixer_paths.xml
+++ b/configs/lahaina/mixer_paths.xml
@@ -2945,10 +2945,10 @@
<ctl name="TX_CDC_DMA_TX_3 Channels" value="Two" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
<ctl name="TX DEC1 MUX" value="SWR_MIC" />
- <ctl name="TX SMIC MUX1" value="SWR_MIC2" />
+ <ctl name="TX SMIC MUX1" value="SWR_MIC0" />
<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="TX SMIC MUX2" value="SWR_MIC2" />
<ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX1_CH1" />
<ctl name="SWR_MIC2 HIFI PortMap" value="SWRM_TX1_CH3" />
<ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />
@@ -3066,12 +3066,12 @@
<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_MIC11" />
- <ctl name="TX SMIC MUX2" value="SWR_MIC8" />
- <ctl name="TX SMIC MUX3" value="SWR_MIC10" />
- <ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX3_CH4" />
+ <ctl name="TX SMIC MUX1" value="SWR_MIC8" />
+ <ctl name="TX SMIC MUX2" value="SWR_MIC10" />
+ <ctl name="TX SMIC MUX3" value="SWR_MIC11" />
<ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX3_CH1" />
<ctl name="SWR_MIC2 HIFI PortMap" value="SWRM_TX3_CH3" />
+ <ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX3_CH4" />
<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" />
@@ -3085,12 +3085,12 @@
<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_MIC11" />
- <ctl name="TX SMIC MUX2" value="SWR_MIC8" />
- <ctl name="TX SMIC MUX3" value="SWR_MIC10" />
- <ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX3_CH4" />
+ <ctl name="TX SMIC MUX1" value="SWR_MIC8" />
+ <ctl name="TX SMIC MUX2" value="SWR_MIC10" />
+ <ctl name="TX SMIC MUX3" value="SWR_MIC11" />
<ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX3_CH1" />
<ctl name="SWR_MIC2 HIFI PortMap" value="SWRM_TX3_CH3" />
+ <ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX3_CH4" />
<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" />
@@ -3111,14 +3111,14 @@
<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_MIC11" />
- <ctl name="TX SMIC MUX2" value="SWR_MIC8" />
+ <ctl name="TX SMIC MUX1" value="SWR_MIC8" />
+ <ctl name="TX SMIC MUX2" value="SWR_MIC9" />
<ctl name="TX SMIC MUX3" value="SWR_MIC10" />
- <ctl name="TX SMIC MUX4" value="SWR_MIC9" />
- <ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX3_CH4" />
+ <ctl name="TX SMIC MUX4" value="SWR_MIC11" />
<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_MIC2 HIFI PortMap" value="SWRM_TX3_CH3" />
+ <ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX3_CH4" />
<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" />
diff --git a/configs/lahaina/mixer_paths_cdp.xml b/configs/lahaina/mixer_paths_cdp.xml
index 97ae467..e675995 100644
--- a/configs/lahaina/mixer_paths_cdp.xml
+++ b/configs/lahaina/mixer_paths_cdp.xml
@@ -2943,12 +2943,12 @@
<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_MIC11" />
- <ctl name="TX SMIC MUX2" value="SWR_MIC8" />
- <ctl name="TX SMIC MUX3" value="SWR_MIC10" />
- <ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX3_CH4" />
+ <ctl name="TX SMIC MUX1" value="SWR_MIC8" />
+ <ctl name="TX SMIC MUX2" value="SWR_MIC10" />
+ <ctl name="TX SMIC MUX3" value="SWR_MIC11" />
<ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX3_CH1" />
<ctl name="SWR_MIC2 HIFI PortMap" value="SWRM_TX3_CH3" />
+ <ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX3_CH4" />
<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" />
@@ -2973,14 +2973,14 @@
<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_MIC11" />
- <ctl name="TX SMIC MUX2" value="SWR_MIC8" />
+ <ctl name="TX SMIC MUX1" value="SWR_MIC8" />
+ <ctl name="TX SMIC MUX2" value="SWR_MIC9" />
<ctl name="TX SMIC MUX3" value="SWR_MIC10" />
- <ctl name="TX SMIC MUX4" value="SWR_MIC9" />
- <ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX3_CH4" />
+ <ctl name="TX SMIC MUX4" value="SWR_MIC11" />
<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_MIC2 HIFI PortMap" value="SWRM_TX3_CH3" />
+ <ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX3_CH4" />
<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" />