diff --git a/audio/mixer_paths_waipio_mtp.xml b/audio/mixer_paths_waipio_mtp.xml
index f8ce6c1..6892b86 100644
--- a/audio/mixer_paths_waipio_mtp.xml
+++ b/audio/mixer_paths_waipio_mtp.xml
@@ -243,22 +243,22 @@
     <ctl name="RX_RX0 Digital Volume" value="84" />
     <ctl name="RX_RX1 Digital Volume" value="84" />
     <ctl name="RX_RX2 Digital Volume" value="84" />
-    <ctl name="HPHL Volume" value="20" />
-    <ctl name="HPHR Volume" value="20" />
+    <ctl name="HPHL Volume" value="18" />
+    <ctl name="HPHR Volume" value="18" />
 
-    <ctl name="TX_DEC0 Volume" value="102" />
-    <ctl name="TX_DEC1 Volume" value="114" />
-    <ctl name="TX_DEC2 Volume" value="114" />
-    <ctl name="TX_DEC3 Volume" value="114" />
-    <ctl name="TX_DEC4 Volume" value="144" />
+    <ctl name="TX_DEC0 Volume" value="84" />
+    <ctl name="TX_DEC1 Volume" value="84" />
+    <ctl name="TX_DEC2 Volume" value="84" />
+    <ctl name="TX_DEC3 Volume" value="84" />
+    <ctl name="TX_DEC4 Volume" value="84" />
     <ctl name="TX_DEC5 Volume" value="84" />
     <ctl name="TX_DEC6 Volume" value="84" />
     <ctl name="TX_DEC7 Volume" value="84" />
 
-    <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="ADC1 Volume" value="6" />
+    <ctl name="ADC2 Volume" value="6" />
+    <ctl name="ADC3 Volume" value="6" />
+    <ctl name="ADC4 Volume" value="6" />
 
     <!-- Compander controls -->
     <ctl name="WSA_COMP1 Switch" value="0" />
@@ -292,6 +292,109 @@
     <ctl name="WSA_RX INT0 VBAT WSA RX0 VBAT Enable" value="0" />
     <ctl name="WSA_RX INT1 VBAT WSA RX1 VBAT Enable" value="0" />
 
+    <!-- add new cirrus CS35L41 controls  -->
+    <ctl name="TH DSP1 Firmware" value="Protection" />
+    <ctl name="TH DSP1 Preload Switch" value="1" />
+    <ctl name="TH DRE DRE Switch" value="0" />
+    <ctl name="TH PCM Source" value="None" />
+    <ctl name="TH ASPTX Ref" value="None" />
+    <ctl name="TH PCM Soft Ramp" value="4ms" />
+    <ctl name="TH AMP PCM Gain" value="18" />
+    <ctl name="TH ASP TX1 Source" value="DSPTX1" />
+    <ctl name="TH ASP TX2 Source" value="Zero" />
+    <ctl name="TH ASP TX3 Source" value="Zero" />
+    <ctl name="TH ASP TX4 Source" value="Zero" />
+    <ctl name="TH ASPRX1 Slot Position" value="0" />
+    <ctl name="TH ASPRX2 Slot Position" value="4" />
+    <ctl name="TH ASPTX1 Slot Position" value="1" />
+    <ctl name="TH DSP RX1 Source" value="ASPRX1" />
+    <ctl name="TH DSP RX2 Source" value="ASPRX1" />
+    <ctl name="TH Boost Class-H Tracking Enable" value="1" />
+    <ctl name="TH Boost Target Voltage" value="0" />
+    <ctl name="TH Fast Use Case Switch Enable" value="1"/>
+    <ctl name="TH Digital PCM Volume"  value="817"/>
+    <ctl name="TH Noise Gate" value="51" />
+    <ctl name="TH Fast Use Case Delta File" value="TH-music.txt" />
+    <ctl name="TH AMP Enable Switch" value="0" />
+
+    <ctl name="TL DSP1 Firmware" value="Protection" />
+    <ctl name="TL DSP1 Preload Switch" value="1" />
+    <ctl name="TL DRE DRE Switch" value="0" />
+    <ctl name="TL PCM Source" value="None" />
+    <ctl name="TL ASPTX Ref" value="None" />
+    <ctl name="TL PCM Soft Ramp" value="4ms" />
+    <ctl name="TL AMP PCM Gain" value="18" />
+    <ctl name="TL ASP TX1 Source" value="DSPTX1" />
+    <ctl name="TL ASP TX2 Source" value="Zero" />
+    <ctl name="TL ASP TX3 Source" value="Zero" />
+    <ctl name="TL ASP TX4 Source" value="Zero" />
+    <ctl name="TL ASPRX1 Slot Position" value="0" />
+    <ctl name="TL ASPRX2 Slot Position" value="2" />
+    <ctl name="TL ASPTX1 Slot Position" value="0" />
+    <ctl name="TL ASPTX2 Slot Position" value="0" />
+    <ctl name="TL ASPTX3 Slot Position" value="0" />
+    <ctl name="TL ASPTX4 Slot Position" value="0" />
+    <ctl name="TL DSP RX1 Source" value="ASPRX1" />
+    <ctl name="TL DSP RX2 Source" value="ASPRX2" />
+    <ctl name="TL Boost Class-H Tracking Enable" value="1" />
+    <ctl name="TL Boost Target Voltage" value="0" />
+    <ctl name="TL Fast Use Case Switch Enable" value="1"/>
+    <ctl name="TL Digital PCM Volume"  value="817"/>
+    <ctl name="TL Noise Gate" value="51" />
+    <ctl name="TL Fast Use Case Delta File" value="TL-music.txt" />
+    <ctl name="TL AMP Enable Switch" value="0" />
+
+    <ctl name="BH DSP1 Firmware" value="Protection" />
+    <ctl name="BH DSP1 Preload Switch" value="1" />
+    <ctl name="BH DRE DRE Switch" value="0" />
+    <ctl name="BH PCM Source" value="None" />
+    <ctl name="BH ASPTX Ref" value="None" />
+    <ctl name="BH PCM Soft Ramp" value="4ms" />
+    <ctl name="BH AMP PCM Gain" value="18" />
+    <ctl name="BH ASP TX1 Source" value="DSPTX1" />
+    <ctl name="BH ASP TX2 Source" value="Zero" />
+    <ctl name="BH ASP TX3 Source" value="Zero" />
+    <ctl name="BH ASP TX4 Source" value="Zero" />
+    <ctl name="BH ASPRX1 Slot Position" value="1" />
+    <ctl name="BH ASPRX2 Slot Position" value="4" />
+    <ctl name="BH ASPTX1 Slot Position" value="3" />
+    <ctl name="BH DSP RX1 Source" value="ASPRX1" />
+    <ctl name="BH DSP RX2 Source" value="ASPRX1" />
+    <ctl name="BH Boost Class-H Tracking Enable" value="1" />
+    <ctl name="BH Boost Target Voltage" value="0" />
+    <ctl name="BH Fast Use Case Switch Enable" value="1"/>
+    <ctl name="BH Digital PCM Volume"  value="817"/>>
+    <ctl name="BH Noise Gate" value="51" />
+    <ctl name="BH Fast Use Case Delta File" value="BH-music.txt" />
+    <ctl name="BH AMP Enable Switch" value="0" />
+
+    <ctl name="BL DSP1 Firmware" value="Protection" />
+    <ctl name="BL DSP1 Preload Switch" value="1" />
+    <ctl name="BL DRE DRE Switch" value="0" />
+    <ctl name="BL PCM Source" value="None" />
+    <ctl name="BL ASPTX Ref" value="None" />
+    <ctl name="BL PCM Soft Ramp" value="4ms" />
+    <ctl name="BL AMP PCM Gain" value="18" />
+    <ctl name="BL ASP TX1 Source" value="DSPTX1" />
+    <ctl name="BL ASP TX2 Source" value="Zero" />
+    <ctl name="BL ASP TX3 Source" value="Zero" />
+    <ctl name="BL ASP TX4 Source" value="Zero" />
+    <ctl name="BL ASPRX1 Slot Position" value="1" />
+    <ctl name="BL ASPRX2 Slot Position" value="4" />
+    <ctl name="BL ASPTX1 Slot Position" value="2" />
+    <ctl name="BL DSP RX1 Source" value="ASPRX1" />
+    <ctl name="BL DSP RX2 Source" value="ASPRX1" />
+    <ctl name="BL Boost Class-H Tracking Enable" value="1" />
+    <ctl name="BL Boost Target Voltage" value="0" />
+    <ctl name="BL Fast Use Case Switch Enable" value="1"/>
+    <ctl name="BL Digital PCM Volume"  value="817"/>
+    <ctl name="BL Noise Gate" value="51" />
+    <ctl name="BL Fast Use Case Delta File" value="BL-music.txt" />
+    <ctl name="BL AMP Enable Switch" value="0" />
+
+    <ctl name="TL Spksw Gpio Swtich"  value="0"/>
+    <!-- cirrus CS35L41 controls end -->
+
     <!-- Codec controls end -->
 
     <!-- defaults for mmap record -->
@@ -1912,6 +2015,18 @@
     </path>
 
     <!-- These are actual sound device specific mixer settings -->
+    <path name="amic1">
+        <ctl name="TX DEC2 MUX" value="SWR_MIC" />
+        <ctl name="TX_DEC2 Volume" value="102" />
+        <ctl name="TX SMIC MUX2" value="SWR_MIC4" />
+        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+        <ctl name="ADC1 ChMap" value="SWRM_TX2_CH1" />
+        <ctl name="ADC1 Volume" value="8" />
+        <ctl name="TX1 MODE" value="ADC_LP" />
+        <ctl name="ADC1_MIXER Switch" value="1" />
+        <ctl name="AMIC1_MIXER Switch" value="1" />
+    </path>
+
     <path name="amic2">
         <ctl name="TX DEC0 MUX" value="SWR_MIC" />
         <ctl name="TX SMIC MUX0" value="SWR_MIC5" />
@@ -1927,6 +2042,19 @@
         <ctl name="AMIC2_MIXER Switch" value="1" />
     </path>
 
+    <path name="amic5">
+        <ctl name="TX DEC3 MUX" value="SWR_MIC" />
+        <ctl name="TX_DEC3 Volume" value="102" />
+        <ctl name="TX SMIC MUX3" value="SWR_MIC9" />
+        <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
+        <ctl name="ADC4 MUX" value="INP5" />
+        <ctl name="ADC4 Volume" value="8" />
+        <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
+        <ctl name="TX3 MODE" value="ADC_LP" />
+        <ctl name="ADC4_MIXER Switch" value="1" />
+        <ctl name="AMIC5_MIXER Switch" value="1" />
+    </path>
+
     <path name="dmic1">
         <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
         <ctl name="TX DMIC MUX2" value="DMIC0" />
@@ -1948,18 +2076,22 @@
     </path>
 
     <path name="speaker">
-        <ctl name="WSA RX0 MUX" value="AIF1_PB" />
-        <ctl name="WSA RX1 MUX" value="AIF1_PB" />
-        <ctl name="WSA_RX0 INP0" value="RX0" />
-        <ctl name="WSA_RX1 INP0" value="RX1" />
-        <ctl name="WSA_COMP1 Switch" value="1" />
-        <ctl name="WSA_COMP2 Switch" value="1" />
-        <ctl name="SpkrLeft COMP Switch" value="1" />
-        <ctl name="SpkrLeft VISENSE Switch" value="1" />
-        <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
-        <ctl name="SpkrRight COMP Switch" value="1" />
-        <ctl name="SpkrRight VISENSE Switch" value="1" />
-        <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
+        <ctl name="TH PCM Source" value="DSP" />
+        <ctl name="TH ASPTX Ref" value="Ref" />
+        <ctl name="TH AMP Enable Switch" value="1" />
+        <ctl name="TL PCM Source" value="DSP" />
+        <ctl name="TL ASPTX Ref" value="Ref" />
+        <ctl name="TL AMP Enable Switch" value="1" />
+        <ctl name="BH PCM Source" value="DSP" />
+        <ctl name="BH ASPTX Ref" value="Ref" />
+        <ctl name="BH AMP Enable Switch" value="1" />
+        <ctl name="BL PCM Source" value="DSP" />
+        <ctl name="BL ASPTX Ref" value="Ref" />
+        <ctl name="BL AMP Enable Switch" value="1" />
+        <ctl name="TH Noise Gate" value="16245" />
+        <ctl name="TL Noise Gate" value="16245" />
+        <ctl name="BH Noise Gate" value="16245" />
+        <ctl name="BL Noise Gate" value="16245" />
     </path>
 
     <path name="haptics-dev">
@@ -1967,37 +2099,43 @@
     </path>
 
     <path name="speaker-mono">
-        <ctl name="WSA RX0 MUX" value="AIF1_PB" />
-        <ctl name="WSA_RX0 INP0" value="RX0" />
-        <ctl name="WSA_COMP1 Switch" value="1" />
-        <ctl name="SpkrLeft COMP Switch" value="1" />
-        <ctl name="SpkrLeft VISENSE Switch" value="1" />
-        <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
+        <ctl name="TH PCM Source" value="DSP" />
+        <ctl name="TH ASPTX Ref" value="Ref" />
+        <ctl name="TH AMP Enable Switch" value="1" />
+        <ctl name="TL PCM Source" value="DSP" />
+        <ctl name="TL ASPTX Ref" value="Ref" />
+        <ctl name="TL AMP Enable Switch" value="1" />
     </path>
 
     <path name="speaker-mono-2">
-        <ctl name="WSA RX1 MUX" value="AIF1_PB" />
-        <ctl name="WSA_RX1 INP0" value="RX1" />
-        <ctl name="WSA_COMP2 Switch" value="1" />
-        <ctl name="SpkrRight COMP Switch" value="1" />
-        <ctl name="SpkrRight VISENSE Switch" value="1" />
-        <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
+        <ctl name="TH PCM Source" value="DSP" />
+        <ctl name="TH ASPTX Ref" value="Ref" />
+        <ctl name="TH AMP Enable Switch" value="1" />
+        <ctl name="TL PCM Source" value="DSP" />
+        <ctl name="TL ASPTX Ref" value="Ref" />
+        <ctl name="TL AMP Enable Switch" value="1" />
+        <ctl name="BH PCM Source" value="DSP" />
+        <ctl name="BH ASPTX Ref" value="Ref" />
+        <ctl name="BH AMP Enable Switch" value="1" />
+        <ctl name="BL PCM Source" value="DSP" />
+        <ctl name="BL ASPTX Ref" value="Ref" />
+        <ctl name="BL AMP Enable Switch" value="1" />
+        <ctl name="TH Fast Use Case Delta File" value="TH-handfree.txt" />
+        <ctl name="TL Fast Use Case Delta File" value="TL-handfree.txt" />
+        <ctl name="BH Fast Use Case Delta File" value="BH-handfree.txt" />
+        <ctl name="BL Fast Use Case Delta File" value="BL-handfree.txt" />
     </path>
 
    <path name="speaker-mono-vbat">
        <path name="speaker-mono" />
-       <ctl name="WSA_RX INT0 VBAT WSA RX0 VBAT Enable" value="1" />
    </path>
 
    <path name="speaker-mono-2-vbat">
        <path name="speaker-mono-2" />
-       <ctl name="WSA_RX INT1 VBAT WSA RX1 VBAT Enable" value="1" />
    </path>
 
    <path name="speaker-vbat">
        <path name="speaker" />
-       <ctl name="WSA_RX INT0 VBAT WSA RX0 VBAT Enable" value="1" />
-       <ctl name="WSA_RX INT1 VBAT WSA RX1 VBAT Enable" value="1" />
    </path>
 
     <path name="speaker-hdk">
@@ -2049,40 +2187,31 @@
     </path>
 
     <path name="sidetone-handset">
-        <path name="sidetone-iir" />
-        <ctl name="IIR0 INP0 Volume" value="0" />
-        <ctl name="IIR0 INP0 MUX" value="DEC2" />
-        <ctl name="RX INT2 MIX2 INP" value="SRC0" />
-        <ctl name="WSA_RX0 INT0 SIDETONE MIX" value="SRC0" />
     </path>
 
     <path name="afe-sidetone">
     </path>
 
     <path name="speaker-mic">
-        <path name="dmic3" />
+        <path name="amic5" />
     </path>
 
     <path name="speaker-mic-liquid">
-        <path name="dmic1" />
+        <path name="amic5" />
     </path>
 
     <path name="speaker-mic-sbc">
     </path>
 
     <path name="speaker-protected">
-        <ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_1" value="1" />
-        <ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_2" value="1" />
         <path name="speaker" />
     </path>
 
     <path name="voice-speaker-protected">
-        <ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_1" value="1" />
         <path name="speaker-mono" />
     </path>
 
     <path name="voice-speaker-2-protected">
-        <ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_2" value="1" />
         <path name="speaker-mono-2" />
     </path>
 
@@ -2092,18 +2221,14 @@
 
     <path name="speaker-protected-vbat">
         <path name="speaker-protected" />
-        <ctl name="WSA_RX INT0 VBAT WSA RX0 VBAT Enable" value="1" />
-        <ctl name="WSA_RX INT1 VBAT WSA RX1 VBAT Enable" value="1" />
     </path>
 
     <path name="voice-speaker-protected-vbat">
         <path name="voice-speaker-protected" />
-        <ctl name="WSA_RX INT0 VBAT WSA RX0 VBAT Enable" value="1" />
     </path>
 
     <path name="voice-speaker-2-protected-vbat">
         <path name="voice-speaker-2-protected" />
-        <ctl name="WSA_RX INT1 VBAT WSA RX1 VBAT Enable" value="1" />
     </path>
 
     <path name="voice-speaker-stereo-protected-vbat">
@@ -2124,17 +2249,15 @@
     </path>
 
     <path name="handset">
-        <ctl name="WSA RX0 MUX" value="AIF1_PB" />
-        <ctl name="WSA_RX0 INP0" value="RX0" />
-        <ctl name="WSA_COMP1 Switch" value="1" />
-        <ctl name="SpkrLeft COMP Switch" value="1" />
-        <ctl name="SpkrLeft VISENSE Switch" value="1" />
-        <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
-        <ctl name="WSA_RX0 Digital Volume" value="70" />
+        <ctl name="TL PCM Source" value="DSP" />
+        <ctl name="TL ASPTX Ref" value="Ref" />
+        <ctl name="TL AMP PCM Gain" value="5" />
+        <ctl name="TL AMP Enable Switch" value="1" />
+        <ctl name="TL Fast Use Case Delta File" value="TL-handset.txt" />
     </path>
 
     <path name="handset-mic">
-        <path name="dmic2" />
+        <path name="amic1" />
     </path>
 
     <path name="handset-mic-unprocessed">
@@ -2143,18 +2266,23 @@
     </path>
 
     <path name="ultrasound-handset">
-        <ctl name="WSA RX_MIX0 MUX" value="AIF_MIX1_PB" />
-        <ctl name="WSA_RX0 MIX INP" value="RX_MIX0" />
-        <ctl name="WSA_COMP1 Switch" value="1" />
-        <ctl name="SpkrLeft COMP Switch" value="1" />
-        <ctl name="SpkrLeft VISENSE Switch" value="1" />
-        <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
-        <ctl name="WSA_RX0 Digital Volume" value="50" />
+        <ctl name="TL PCM Source" value="DSP" />
+        <ctl name="TL ASPTX Ref" value="Ref" />
+        <ctl name="TL AMP Enable Switch" value="1" />
+        <ctl name="TL AMP PCM Gain" value="5" />
     </path>
 
     <path name="ultrasound-mic">
+        <ctl name="TX DEC4 MUX" value="SWR_MIC" />
+        <ctl name="TX_DEC4 Volume" value="84" />
+        <ctl name="TX SMIC MUX4" value="SWR_MIC8" />
         <ctl name="TX_AIF2_CAP Mixer DEC4" value="1" />
-        <ctl name="TX DMIC MUX4" value="DMIC2" />
+        <ctl name="ADC3 Volume" value="12" />
+        <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" />
+        <ctl name="TX2 MODE" value="ADC_LP" />
+        <ctl name="HDR34 MUX" value="HDR34" />
+        <ctl name="ADC3_MIXER Switch" value="1" />
+        <ctl name="AMIC5_MIXER Switch" value="1" />
     </path>
 
     <path name="headphones">
@@ -2392,18 +2520,37 @@
     </path>
 
     <path name="va-mic-mono">
+        <ctl name="VA_CDC_DMA_TX_0 Channels" value="One" />
         <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
-        <ctl name="VA DEC0 MUX" value="MSM_DMIC" />
-        <ctl name="VA DMIC MUX0" value="DMIC1" />
+        <ctl name="VA DEC0 MUX" value="SWR_MIC" />
+        <ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" />
+        <ctl name="TX3 MODE" value="ADC_LP" />
+        <ctl name="VA SMIC MUX0" value="SWR_MIC9" />
+        <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
+        <ctl name="VA_AMIC5_MIXER Switch" value="1" />
+        <ctl name="ADC4 MUX" value="INP5" />
+        <ctl name="ADC4_MIXER Switch" value="1" />
     </path>
 
     <path name="va-mic-dmic">
+        <ctl name="VA_CDC_DMA_TX_0 Channels" value="Two" />
         <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
         <ctl name="VA_AIF1_CAP Mixer DEC1" value="1" />
-        <ctl name="VA DEC0 MUX" value="MSM_DMIC" />
-        <ctl name="VA DEC1 MUX" value="MSM_DMIC" />
-        <ctl name="VA DMIC MUX0" value="DMIC1" />
-        <ctl name="VA DMIC MUX1" value="DMIC3" />
+        <ctl name="VA DEC0 MUX" value="SWR_MIC" />
+        <ctl name="VA DEC1 MUX" value="SWR_MIC" />
+        <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="TX3 MODE" value="ADC_LP" />
+        <ctl name="VA SMIC MUX0" value="SWR_MIC4" />
+        <ctl name="VA SMIC MUX1" value="SWR_MIC9" />
+        <ctl name="ADC1 ChMap" value="SWRM_TX2_CH1" />
+        <ctl name="VA_AMIC1_MIXER Switch" value="1" />
+        <ctl name="ADC1_MIXER Switch" value="1" />
+        <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
+        <ctl name="VA_AMIC5_MIXER Switch" value="1" />
+        <ctl name="ADC4 MUX" value="INP5" />
+        <ctl name="ADC4_MIXER Switch" value="1" />
     </path>
 
     <path name="va-mic-tmic">
@@ -2439,19 +2586,37 @@
 
     <path name="va-mic-mono-lpi">
         <ctl name="LPI Enable" value="1" />
+        <ctl name="VA_CDC_DMA_TX_0 Channels" value="One" />
         <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
-        <ctl name="VA DEC0 MUX" value="MSM_DMIC" />
-        <ctl name="VA DMIC MUX0" value="DMIC1" />
+        <ctl name="VA DEC0 MUX" value="SWR_MIC" />
+        <ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" />
+        <ctl name="TX0 MODE" value="ADC_LP" />
+        <ctl name="VA SMIC MUX0" value="SWR_MIC4" />
+        <ctl name="ADC1 ChMap" value="SWRM_TX2_CH1" />
+        <ctl name="VA_AMIC1_MIXER Switch" value="1" />
+        <ctl name="ADC1_MIXER Switch" value="1" />
     </path>
 
     <path name="va-mic-dmic-lpi">
         <ctl name="LPI Enable" value="1" />
+        <ctl name="VA_CDC_DMA_TX_0 Channels" value="Two" />
         <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
         <ctl name="VA_AIF1_CAP Mixer DEC1" value="1" />
-        <ctl name="VA DEC0 MUX" value="MSM_DMIC" />
-        <ctl name="VA DEC1 MUX" value="MSM_DMIC" />
-        <ctl name="VA DMIC MUX0" value="DMIC1" />
-        <ctl name="VA DMIC MUX1" value="DMIC2" />
+        <ctl name="VA DEC0 MUX" value="SWR_MIC" />
+        <ctl name="VA DEC1 MUX" value="SWR_MIC" />
+        <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="TX3 MODE" value="ADC_LP" />
+        <ctl name="VA SMIC MUX0" value="SWR_MIC4" />
+        <ctl name="VA SMIC MUX1" value="SWR_MIC9" />
+        <ctl name="ADC1 ChMap" value="SWRM_TX2_CH1" />
+        <ctl name="VA_AMIC1_MIXER Switch" value="1" />
+        <ctl name="ADC1_MIXER Switch" value="1" />
+        <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
+        <ctl name="VA_AMIC5_MIXER Switch" value="1" />
+        <ctl name="ADC4 MUX" value="INP5" />
+        <ctl name="ADC4_MIXER Switch" value="1" />
     </path>
 
     <path name="va-mic-tmic-lpi">
@@ -2488,48 +2653,124 @@
     </path>
 
     <path name="headset-va-mic-lpi">
-         <ctl name="LPI Enable" value="1" />
-         <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
-         <ctl name="VA DEC0 MUX" value="SWR_MIC" />
-         <ctl name="VA SMIC MUX0" value="SWR_MIC5" />
-         <ctl name="TX1 MODE" value="ADC_LP" />
-         <ctl name="ADC2 MUX" value="INP2" />
-         <ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" />
-         <ctl name="ADC2 ChMap" value="SWRM_TX2_CH2" />
-         <ctl name="HDR12 MUX" value="NO_HDR12" />
-         <ctl name="ADC2_BCS Disable" value="1" />
-         <ctl name="ADC2_MIXER Switch" value="1" />
-         <ctl name="VA_AMIC2_MIXER Switch" value="1" />
+        <ctl name="LPI Enable" value="1" />
+        <ctl name="DEC0_BCS Switch" value="1" />
+        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
+        <ctl name="VA DEC0 MUX" value="SWR_MIC" />
+        <ctl name="VA SMIC MUX0" value="SWR_MIC5" />
+        <ctl name="TX1 MODE" value="ADC_LP" />
+        <ctl name="ADC2 MUX" value="INP2" />
+        <ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" />
+        <ctl name="ADC2 ChMap" value="SWRM_TX2_CH2" />
+        <ctl name="MBHC ChMap" value="SWRM_TX1_CH3" />
+        <ctl name="TX1 MODE" value="ADC_LP" />
+        <ctl name="BCS Channel" value="CH2" />
+        <ctl name="HDR12 MUX" value="NO_HDR12" />
+        <ctl name="ADC2_BCS Disable" value="0" />
+        <ctl name="ADC2_MIXER Switch" value="1" />
+        <ctl name="VA_AMIC2_MIXER Switch" value="1" />
     </path>
 
     <path name="headset-va-mic">
-         <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
-         <ctl name="VA DEC0 MUX" value="SWR_MIC" />
-         <ctl name="VA SMIC MUX0" value="SWR_MIC5" />
-         <ctl name="TX1 MODE" value="ADC_LP" />
-         <ctl name="ADC2 MUX" value="INP2" />
-         <ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" />
-         <ctl name="ADC2 ChMap" value="SWRM_TX2_CH2" />
-         <ctl name="HDR12 MUX" value="NO_HDR12" />
-         <ctl name="ADC2_BCS Disable" value="1" />
-         <ctl name="ADC2_MIXER Switch" value="1" />
-         <ctl name="VA_AMIC2_MIXER Switch" value="1" />
+        <ctl name="DEC0_BCS Switch" value="1" />
+        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
+        <ctl name="VA DEC0 MUX" value="SWR_MIC" />
+        <ctl name="VA SMIC MUX0" value="SWR_MIC5" />
+        <ctl name="TX1 MODE" value="ADC_LP" />
+        <ctl name="ADC2 MUX" value="INP2" />
+        <ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" />
+        <ctl name="ADC2 ChMap" value="SWRM_TX2_CH2" />
+        <ctl name="MBHC ChMap" value="SWRM_TX1_CH3" />
+        <ctl name="TX1 MODE" value="ADC_LP" />
+        <ctl name="BCS Channel" value="CH2" />
+        <ctl name="HDR12 MUX" value="NO_HDR12" />
+        <ctl name="ADC2_BCS Disable" value="0" />
+        <ctl name="ADC2_MIXER Switch" value="1" />
+        <ctl name="VA_AMIC2_MIXER Switch" value="1" />
     </path>
 
 
     <!-- Dual MIC devices -->
     <path name="handset-dmic-endfire">
+        <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="TX DMIC MUX1" value="DMIC1" />
-        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
-        <ctl name="TX DMIC MUX2" value="DMIC3" />
+        <ctl name="ADC1 ChMap" value="SWRM_TX2_CH1" />
+        <ctl name="TX0 MODE" value="ADC_LP" />
+        <ctl name="ADC1_MIXER Switch" value="1" />
+        <ctl name="AMIC1_MIXER Switch" value="1" />
+        <ctl name="TX DEC3 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX3" value="SWR_MIC9" />
+        <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
+        <ctl name="ADC4 MUX" value="INP5" />
+        <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
+        <ctl name="TX3 MODE" value="ADC_LP" />
+        <ctl name="ADC4_MIXER Switch" value="1" />
+        <ctl name="AMIC5_MIXER Switch" value="1" />
+        <ctl name="ADC1 Volume" value="8" />
+        <ctl name="ADC4 Volume" value="8" />
     </path>
 
     <path name="speaker-dmic-endfire">
+        <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="TX DMIC MUX1" value="DMIC2" />
+        <ctl name="ADC1 ChMap" value="SWRM_TX2_CH1" />
+        <ctl name="TX0 MODE" value="ADC_LP" />
+        <ctl name="ADC1_MIXER Switch" value="1" />
+        <ctl name="AMIC1_MIXER Switch" value="1" />
+        <ctl name="TX DEC3 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX3" value="SWR_MIC9" />
+        <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
+        <ctl name="ADC4 MUX" value="INP5" />
+        <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
+        <ctl name="TX3 MODE" value="ADC_LP" />
+        <ctl name="ADC4_MIXER Switch" value="1" />
+        <ctl name="AMIC5_MIXER Switch" value="1" />
+        <ctl name="ADC1 Volume" value="6" />
+        <ctl name="ADC4 Volume" value="6" />
+    </path>
+
+    <!-- Dual ADC MIC devices -->
+    <path name="handset-dmic-dual-adc">
+        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
+        <ctl name="TX DEC1 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX1" value="SWR_MIC9" />
+        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
+        <ctl name="TX DEC0 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX0" value="SWR_MIC8" />
+        <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
+        <ctl name="TX DEC3 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX3" value="SWR_MIC5" />
         <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
-        <ctl name="TX DMIC MUX2" value="DMIC3" />
+        <ctl name="TX DEC2 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX2" value="SWR_MIC4" />
+        <ctl name="ADC1 ChMap" value="SWRM_TX2_CH1" />
+        <ctl name="ADC2 ChMap" value="SWRM_TX2_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="AMIC1_MIXER Switch" value="1" />
+        <ctl name="ADC1 ChMap" value="SWRM_TX2_CH1" />
+        <ctl name="TX0 MODE" value="ADC_LP" />
+        <ctl name="ADC2 MUX" value="INP2" />
+        <ctl name="HDR12 MUX" value="HDR12" />
+        <ctl name="ADC2_MIXER Switch" value="1" />
+        <ctl name="ADC2 ChMap" value="SWRM_TX2_CH2" />
+        <ctl name="TX1 MODE" value="ADC_LP" />
+        <ctl name="HDR34 MUX" value="HDR34" />
+        <ctl name="ADC3_MIXER Switch" value="1" />
+        <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" />
+        <ctl name="TX2 MODE" value="ADC_LP" />
+        <ctl name="ADC4 MUX" value="INP5" />
+        <ctl name="ADC4_MIXER Switch" value="1" />
+        <ctl name="AMIC5_MIXER Switch" value="1" />
+        <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
+        <ctl name="TX3 MODE" value="ADC_LP" />
+        <ctl name="ADC1 Volume" value="20" />
+        <ctl name="ADC2 Volume" value="0" />
+        <ctl name="ADC3 Volume" value="20" />
+        <ctl name="ADC4 Volume" value="0" />
     </path>
 
     <path name="dmic-endfire">
@@ -2543,7 +2784,7 @@
     </path>
 
     <path name="handset-stereo-dmic-ef">
-        <path name="handset-dmic-endfire" />
+        <path name="handset-dmic-dual-adc" />
     </path>
 
     <path name="speaker-stereo-dmic-ef">