diff --git a/configs/crow/mixer_paths_crow_idp_wcd9395_wcd_dmic.xml b/configs/crow/mixer_paths_crow_idp_wcd9395_wcd_dmic.xml
old mode 100644
new mode 100755
index de9e43c..5a4d18d
--- a/configs/crow/mixer_paths_crow_idp_wcd9395_wcd_dmic.xml
+++ b/configs/crow/mixer_paths_crow_idp_wcd9395_wcd_dmic.xml
@@ -834,9 +834,9 @@
         <ctl name="VA DEC1 MUX" value="SWR_MIC" />
         <ctl name="VA SMIC MUX0" value="SWR_MIC3" />
         <ctl name="VA SMIC MUX1" value="SWR_MIC0" />
-        <ctl name="DMIC0 ChMap" value="SWRM_TX1_CH2" />
+        <ctl name="DMIC1 ChMap" value="SWRM_TX1_CH4" />
         <ctl name="DMIC3 ChMap" value="SWRM_TX1_CH1" />
-        <ctl name="DMIC0_MIXER Switch" value="1" />
+        <ctl name="DMIC1_MIXER Switch" value="1" />
         <ctl name="DMIC3_MIXER Switch" value="1" />
     </path>
 
@@ -851,10 +851,10 @@
        <ctl name="VA SMIC MUX1" value="SWR_MIC8" />
        <ctl name="VA SMIC MUX0" value="SWR_MIC10" />
        <ctl name="DMIC0 ChMap" value="SWRM_TX2_CH2" />
-       <ctl name="DMIC2 ChMap" value="SWRM_TX3_CH1" />
+       <ctl name="DMIC1 ChMap" value="SWRM_TX3_CH1" />
        <ctl name="DMIC3 ChMap" value="SWRM_TX3_CH3" />
        <ctl name="DMIC0_MIXER Switch" value="1" />
-       <ctl name="DMIC2_MIXER Switch" value="1" />
+       <ctl name="DMIC1_MIXER Switch" value="1" />
        <ctl name="DMIC3_MIXER Switch" value="1" />
     </path>
 
@@ -871,14 +871,14 @@
         <ctl name="VA SMIC MUX2" value="SWR_MIC7" />
         <ctl name="VA SMIC MUX3" value="SWR_MIC9" />
         <ctl name="VA SMIC MUX0" value="SWR_MIC11" />
-        <ctl name="DMIC2 ChMap" value="SWRM_TX3_CH1" />
-        <ctl name="DMIC4 ChMap" value="SWRM_TX2_CH4" />
+        <ctl name="DMIC0 ChMap" value="SWRM_TX2_CH4" />
         <ctl name="DMIC1 ChMap" value="SWRM_TX3_CH2" />
         <ctl name="DMIC3 ChMap" value="SWRM_TX3_CH4" />
-        <ctl name="DMIC2_MIXER Switch" value="1" />
-        <ctl name="DMIC4_MIXER Switch" value="1" />
+        <ctl name="DMIC2 ChMap" value="SWRM_TX3_CH1" />
+        <ctl name="DMIC0_MIXER Switch" value="1" />
         <ctl name="DMIC1_MIXER Switch" value="1" />
         <ctl name="DMIC3_MIXER Switch" value="1" />
+        <ctl name="DMIC2_MIXER Switch" value="1" />
     </path>
 
     <path name="va-mic">
@@ -902,9 +902,9 @@
         <ctl name="VA DEC1 MUX" value="SWR_MIC" />
         <ctl name="VA SMIC MUX0" value="SWR_MIC3" />
         <ctl name="VA SMIC MUX1" value="SWR_MIC0" />
-        <ctl name="DMIC0 ChMap" value="SWRM_TX1_CH2" />
+        <ctl name="DMIC1 ChMap" value="SWRM_TX1_CH4" />
         <ctl name="DMIC3 ChMap" value="SWRM_TX1_CH1" />
-        <ctl name="DMIC0_MIXER Switch" value="1" />
+        <ctl name="DMIC1_MIXER Switch" value="1" />
         <ctl name="DMIC3_MIXER Switch" value="1" />
     </path>
 
@@ -924,10 +924,10 @@
         <ctl name="VA SMIC MUX2" value="SWR_MIC5" />
         <ctl name="DMIC2 ChMap" value="SWRM_TX2_CH1" />
         <ctl name="DMIC0 ChMap" value="SWRM_TX2_CH2" />
-        <ctl name="DMIC3 ChMap" value="SWRM_TX3_CH1" />
+        <ctl name="DMIC4 ChMap" value="SWRM_TX3_CH1" />
         <ctl name="DMIC2_MIXER Switch" value="1" />
         <ctl name="DMIC0_MIXER Switch" value="1" />
-        <ctl name="DMIC3_MIXER Switch" value="1" />
+        <ctl name="DMIC4_MIXER Switch" value="1" />
     </path>
 
     <path name="va-mic-qmic-lpi">
@@ -1000,9 +1000,9 @@
        <ctl name="TX DEC1 MUX" value="SWR_MIC" />
        <ctl name="TX SMIC MUX0" value="SWR_MIC3" />
        <ctl name="TX SMIC MUX1" value="SWR_MIC0" />
-       <ctl name="DMIC0 ChMap" value="SWRM_TX1_CH2" />
+       <ctl name="DMIC1 ChMap" value="SWRM_TX1_CH4" />
        <ctl name="DMIC3 ChMap" value="SWRM_TX1_CH1" />
-       <ctl name="DMIC0_MIXER Switch" value="1" />
+       <ctl name="DMIC1_MIXER Switch" value="1" />
        <ctl name="DMIC3_MIXER Switch" value="1" />
        <ctl name="TX_DEC0 Volume" value="102" />
        <ctl name="TX_DEC1 Volume" value="102" />
@@ -1015,9 +1015,9 @@
        <ctl name="TX DEC1 MUX" value="SWR_MIC" />
        <ctl name="TX SMIC MUX0" value="SWR_MIC3" />
        <ctl name="TX SMIC MUX1" value="SWR_MIC0" />
-       <ctl name="DMIC0 ChMap" value="SWRM_TX1_CH2" />
+       <ctl name="DMIC1 ChMap" value="SWRM_TX1_CH4" />
        <ctl name="DMIC3 ChMap" value="SWRM_TX1_CH1" />
-       <ctl name="DMIC0_MIXER Switch" value="1" />
+       <ctl name="DMIC1_MIXER Switch" value="1" />
        <ctl name="DMIC3_MIXER Switch" value="1" />
        <ctl name="TX_DEC0 Volume" value="102" />
        <ctl name="TX_DEC1 Volume" value="102" />
@@ -1098,10 +1098,10 @@
         <ctl name="TX_DEC1 MODE" value="ADC_LOW_PWR" />
         <ctl name="TX SMIC MUX0" value="SWR_MIC4" />
         <ctl name="TX SMIC MUX1" value="SWR_MIC8" />
-        <ctl name="DMIC0 ChMap" value="SWRM_TX2_CH1" />
+        <ctl name="DMIC1 ChMap" value="SWRM_TX2_CH1" />
         <ctl name="DMIC3 ChMap" value="SWRM_TX3_CH1" />
-        <ctl name="TX_DMIC0_MIXER Switch" value="1" />
-        <ctl name="TX_DMIC4_MIXER Switch" value="1" />
+        <ctl name="TX_DMIC1_MIXER Switch" value="1" />
+        <ctl name="TX_DMIC3_MIXER Switch" value="1" />
     </path>
 
     <path name="dmic-broadside">
@@ -1126,10 +1126,10 @@
        <ctl name="VA SMIC MUX1" value="SWR_MIC8" />
        <ctl name="VA SMIC MUX0" value="SWR_MIC10" />
        <ctl name="DMIC0 ChMap" value="SWRM_TX2_CH2" />
-       <ctl name="DMIC2 ChMap" value="SWRM_TX3_CH1" />
+       <ctl name="DMIC1 ChMap" value="SWRM_TX3_CH1" />
        <ctl name="DMIC3 ChMap" value="SWRM_TX3_CH3" />
        <ctl name="DMIC0_MIXER Switch" value="1" />
-       <ctl name="DMIC2_MIXER Switch" value="1" />
+       <ctl name="DMIC1_MIXER Switch" value="1" />
        <ctl name="DMIC3_MIXER Switch" value="1" />
     </path>
 
@@ -1144,10 +1144,10 @@
        <ctl name="VA SMIC MUX1" value="SWR_MIC8" />
        <ctl name="VA SMIC MUX0" value="SWR_MIC10" />
        <ctl name="DMIC0 ChMap" value="SWRM_TX2_CH2" />
-       <ctl name="DMIC2 ChMap" value="SWRM_TX3_CH1" />
+       <ctl name="DMIC1 ChMap" value="SWRM_TX3_CH1" />
        <ctl name="DMIC3 ChMap" value="SWRM_TX3_CH3" />
        <ctl name="DMIC0_MIXER Switch" value="1" />
-       <ctl name="DMIC2_MIXER Switch" value="1" />
+       <ctl name="DMIC1_MIXER Switch" value="1" />
        <ctl name="DMIC3_MIXER Switch" value="1" />
     </path>
 
@@ -1170,14 +1170,14 @@
        <ctl name="TX SMIC MUX2" value="SWR_MIC7" />
        <ctl name="TX SMIC MUX3" value="SWR_MIC9" />
        <ctl name="TX SMIC MUX0" value="SWR_MIC11" />
-       <ctl name="DMIC2 ChMap" value="SWRM_TX3_CH1" />
-       <ctl name="DMIC4 ChMap" value="SWRM_TX2_CH4" />
-       <ctl name="DMIC1 ChMap" value="SWRM_TX3_CH2" />
-       <ctl name="DMIC3 ChMap" value="SWRM_TX3_CH4" />
-       <ctl name="DMIC2_MIXER Switch" value="1" />
-       <ctl name="DMIC4_MIXER Switch" value="1" />
+       <ctl name="DMIC0 ChMap" value="SWRM_TX2_CH2" />
+       <ctl name="DMIC1 ChMap" value="SWRM_TX3_CH1" />
+       <ctl name="DMIC3 ChMap" value="SWRM_TX3_CH3" />
+       <ctl name="DMIC2 ChMap" value="SWRM_TX3_CH4" />
+       <ctl name="DMIC0_MIXER Switch" value="1" />
        <ctl name="DMIC1_MIXER Switch" value="1" />
        <ctl name="DMIC3_MIXER Switch" value="1" />
+       <ctl name="DMIC2_MIXER Switch" value="1" />
        <ctl name="TX_DEC0 Volume" value="102" />
        <ctl name="TX_DEC1 Volume" value="102" />
        <ctl name="TX_DEC2 Volume" value="102" />
@@ -1209,9 +1209,9 @@
         <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
         <ctl name="TX DMIC MUX2" value="DMIC0" />
         <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
-        <ctl name="TX DMIC MUX3" value="DMIC2" />
+        <ctl name="TX DMIC MUX3" value="DMIC1" />
         <ctl name="TX_AIF1_CAP Mixer DEC4" value="1" />
-        <ctl name="TX DMIC MUX4" value="DMIC2" />
+        <ctl name="TX DMIC MUX4" value="DMIC1" />
     </path>
 
     <path name="handset-dual-dmic-quad-dec-reverse">
diff --git a/configs/crow/mixer_paths_crow_qrd.xml b/configs/crow/mixer_paths_crow_qrd.xml
index 28520e2..587416c 100644
--- a/configs/crow/mixer_paths_crow_qrd.xml
+++ b/configs/crow/mixer_paths_crow_qrd.xml
@@ -288,9 +288,9 @@
 
     <path name="amic3">
         <ctl name="TX DEC2 MUX" value="SWR_MIC" />
-        <ctl name="TX SMIC MUX2" value="SWR_MIC5" />
+        <ctl name="TX SMIC MUX2" value="SWR_MIC6" />
         <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
-        <ctl name="ADC2 ChMap" value="SWRM_TX2_CH2" />
+        <ctl name="ADC2 ChMap" value="SWRM_TX2_CH3" />
         <ctl name="ADC2 MUX" value="INP3" />
         <ctl name="ADC2_MIXER Switch" value="1" />
     </path>
@@ -479,11 +479,11 @@
     </path>
 
     <path name="speaker-mic">
-        <path name="amic3" />
+        <path name="amic1" />
     </path>
 
     <path name="speaker-mic-liquid">
-        <path name="amic3" />
+        <path name="amic1" />
     </path>
 
     <path name="speaker-mic-sbc">
@@ -559,7 +559,6 @@
         <ctl name="WSA RX0 MUX" value="AIF1_PB" />
         <ctl name="WSA_RX0 INP0" value="RX0" />
         <ctl name="WSA_COMP1 Switch" value="1" />
-        <ctl name="Idle Detect" 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" />