configs: msmcobalt: update dmic configuration for voice usecases
Voice quality depends on which dmic is used and its physical
placement on the device. Update correct dimcs based on the mics
placement.
Change-Id: Ia0a997b8750233896269cba5170538e5128ddb6e
diff --git a/configs/msmcobalt/mixer_paths_tasha.xml b/configs/msmcobalt/mixer_paths_tasha.xml
index eb5a150..d096d1f 100644
--- a/configs/msmcobalt/mixer_paths_tasha.xml
+++ b/configs/msmcobalt/mixer_paths_tasha.xml
@@ -1641,15 +1641,6 @@
</path>
<!-- For Tasha, DMIC numbered from 0 to 5 -->
- <path name="dmic3">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="SLIM TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC2" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
- </path>
-
<path name="dmic1">
<ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
<ctl name="SLIM_0_TX Channels" value="One" />
@@ -1668,6 +1659,15 @@
<ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
+ <path name="dmic3">
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
+ <ctl name="SLIM_0_TX Channels" value="One" />
+ <ctl name="SLIM TX7 MUX" value="DEC7" />
+ <ctl name="ADC MUX7" value="DMIC" />
+ <ctl name="DMIC MUX7" value="DMIC2" />
+ <ctl name="IIR0 INP0 MUX" value="DEC7" />
+ </path>
+
<path name="dmic4">
<ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
<ctl name="SLIM_0_TX Channels" value="One" />
@@ -1768,11 +1768,11 @@
</path>
<path name="speaker-mic">
- <path name="dmic3" />
+ <path name="dmic2" />
</path>
<path name="speaker-mic-liquid">
- <path name="dmic3" />
+ <path name="dmic2" />
<ctl name="DEC7 Volume" value="111" />
</path>
@@ -1825,7 +1825,7 @@
</path>
<path name="handset-mic">
- <path name="dmic1" />
+ <path name="dmic3" />
</path>
<path name="handset-mic-db">
@@ -1852,10 +1852,10 @@
<ctl name="DMIC MUX5" value="DMIC0" />
<ctl name="SLIM TX6 MUX" value="DEC6" />
<ctl name="ADC MUX6" value="DMIC" />
- <ctl name="DMIC MUX6" value="DMIC4" />
+ <ctl name="DMIC MUX6" value="DMIC2" />
<ctl name="SLIM TX8 MUX" value="DEC8" />
<ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC3" />
+ <ctl name="DMIC MUX8" value="DMIC5" />
</path>
<path name="anc-handset">
@@ -1867,7 +1867,7 @@
<ctl name="RX0 Digital Volume" value="81" />
<ctl name="ANC Slot" value="6" />
<ctl name="ADC MUX10" value="DMIC" />
- <ctl name="DMIC MUX10" value="DMIC3" />
+ <ctl name="DMIC MUX10" value="DMIC2" />
<ctl name="ANC0 FB MUX" value="ANC_IN_EAR" />
<ctl name="ANC EAR Enable Switch" value="1" />
</path>
@@ -2159,13 +2159,13 @@
<ctl name="AANC_SLIM_0_RX MUX" value="SLIMBUS_0_TX" />
<ctl name="SLIM TX6 MUX" value="DEC6" />
<ctl name="ADC MUX6" value="DMIC" />
- <ctl name="DMIC MUX6" value="DMIC0" />
+ <ctl name="DMIC MUX6" value="DMIC2" />
<ctl name="SLIM TX8 MUX" value="DEC8" />
<ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC3" />
+ <ctl name="DMIC MUX8" value="DMIC4" />
<ctl name="SLIM TX9 MUX" value="DEC7" />
<ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC2" />
+ <ctl name="DMIC MUX7" value="DMIC0" />
<ctl name="IIR0 INP0 MUX" value="DEC6" />
</path>
@@ -2175,10 +2175,10 @@
<ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
<ctl name="SLIM TX7 MUX" value="DEC7" />
<ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC0" />
+ <ctl name="DMIC MUX7" value="DMIC2" />
<ctl name="SLIM TX8 MUX" value="DEC8" />
<ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC3" />
+ <ctl name="DMIC MUX8" value="DMIC4" />
<ctl name="SLIM_0_TX Channels" value="Two" />
</path>
@@ -2187,10 +2187,10 @@
<ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
<ctl name="SLIM TX7 MUX" value="DEC7" />
<ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC2" />
+ <ctl name="DMIC MUX7" value="DMIC1" />
<ctl name="SLIM TX8 MUX" value="DEC8" />
<ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC3" />
+ <ctl name="DMIC MUX8" value="DMIC5" />
<ctl name="SLIM_0_TX Channels" value="Two" />
</path>
@@ -2262,7 +2262,7 @@
<ctl name="SLIM_0_TX Channels" value="Two" />
<ctl name="SLIM TX7 MUX" value="DEC7" />
<ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC0" />
+ <ctl name="DMIC MUX7" value="DMIC1" />
<ctl name="SLIM TX8 MUX" value="DEC8" />
<ctl name="ADC MUX8" value="DMIC" />
<ctl name="DMIC MUX8" value="DMIC2" />
@@ -2286,16 +2286,16 @@
<ctl name="SLIM_0_TX Channels" value="Four" />
<ctl name="SLIM TX5 MUX" value="DEC5" />
<ctl name="ADC MUX5" value="DMIC" />
- <ctl name="DMIC MUX5" value="DMIC0" />
+ <ctl name="DMIC MUX5" value="DMIC1" />
<ctl name="SLIM TX6 MUX" value="DEC6" />
<ctl name="ADC MUX6" value="DMIC" />
- <ctl name="DMIC MUX6" value="DMIC2" />
+ <ctl name="DMIC MUX6" value="DMIC0" />
<ctl name="SLIM TX7 MUX" value="DEC7" />
<ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC1" />
+ <ctl name="DMIC MUX7" value="DMIC2" />
<ctl name="SLIM TX8 MUX" value="DEC8" />
<ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC3" />
+ <ctl name="DMIC MUX8" value="DMIC5" />
</path>
<path name="speaker-qmic-liquid">
@@ -2373,7 +2373,7 @@
<path name="listen-handset-mic">
<ctl name="MADONOFF Switch" value="1" />
- <ctl name="MAD Input" value="DMIC0" />
+ <ctl name="MAD Input" value="DMIC2" />
</path>
<path name="unprocessed-handset-mic">
diff --git a/configs/msmcobalt/mixer_paths_tavil.xml b/configs/msmcobalt/mixer_paths_tavil.xml
index 50e4df4..dab6cac 100644
--- a/configs/msmcobalt/mixer_paths_tavil.xml
+++ b/configs/msmcobalt/mixer_paths_tavil.xml
@@ -45,6 +45,22 @@
<ctl name="Voip Evrc Min Max Rate Config" id="1" value="4" />
<ctl name="Voip Dtx Mode" value="0" />
<ctl name="TTY Mode" value="OFF" />
+ <ctl name="DEC5 Volume" value="84" />
+ <ctl name="DEC6 Volume" value="84" />
+ <ctl name="DEC7 Volume" value="84" />
+ <ctl name="DEC8 Volume" value="84" />
+ <ctl name="CDC_IF TX5 MUX" value="ZERO" />
+ <ctl name="CDC_IF TX6 MUX" value="ZERO" />
+ <ctl name="CDC_IF TX7 MUX" value="ZERO" />
+ <ctl name="CDC_IF TX8 MUX" value="ZERO" />
+ <ctl name="ADC MUX5" value="AMIC" />
+ <ctl name="ADC MUX6" value="AMIC" />
+ <ctl name="ADC MUX7" value="AMIC" />
+ <ctl name="ADC MUX8" value="AMIC" />
+ <ctl name="DMIC MUX5" value="ZERO" />
+ <ctl name="DMIC MUX6" value="ZERO" />
+ <ctl name="DMIC MUX7" value="ZERO" />
+ <ctl name="DMIC MUX8" value="ZERO" />
<ctl name="SLIMBUS_0_RX Port Mixer SLIM_0_TX" value="0" />
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="0" />
@@ -1371,33 +1387,51 @@
<!-- For Tavil, DMIC numbered from 0 to 5 -->
<path name="dmic1">
- <ctl name="AIF1_CAP Mixer SLIM TX0" value="1" />
- <ctl name="CDC_IF TX0 MUX" value="DEC0" />
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+ <ctl name="CDC_IF TX7 MUX" value="DEC7" />
<ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX0" value="DMIC" />
- <ctl name="DMIC MUX0" value="DMIC0" />
- <ctl name="DEC0 Volume" value="84" />
+ <ctl name="ADC MUX7" value="DMIC" />
+ <ctl name="DMIC MUX7" value="DMIC0" />
</path>
<path name="dmic2">
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
+ <ctl name="CDC_IF TX7 MUX" value="DEC7" />
+ <ctl name="SLIM_0_TX Channels" value="One" />
+ <ctl name="ADC MUX7" value="DMIC" />
+ <ctl name="DMIC MUX7" value="DMIC1" />
</path>
<path name="dmic3">
- <ctl name="AIF1_CAP Mixer SLIM TX2" value="1" />
- <ctl name="CDC_IF TX2 MUX" value="DEC2" />
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+ <ctl name="CDC_IF TX7 MUX" value="DEC7" />
<ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX2" value="DMIC" />
- <ctl name="DMIC MUX2" value="DMIC2" />
- <ctl name="DEC2 Volume" value="84" />
+ <ctl name="ADC MUX7" value="DMIC" />
+ <ctl name="DMIC MUX7" value="DMIC2" />
</path>
<path name="dmic4">
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+ <ctl name="CDC_IF TX7 MUX" value="DEC7" />
+ <ctl name="SLIM_0_TX Channels" value="One" />
+ <ctl name="ADC MUX7" value="DMIC" />
+ <ctl name="DMIC MUX7" value="DMIC3" />
</path>
<path name="dmic5">
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+ <ctl name="CDC_IF TX7 MUX" value="DEC7" />
+ <ctl name="SLIM_0_TX Channels" value="One" />
+ <ctl name="ADC MUX7" value="DMIC" />
+ <ctl name="DMIC MUX7" value="DMIC4" />
</path>
<path name="dmic6">
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+ <ctl name="CDC_IF TX7 MUX" value="DEC7" />
+ <ctl name="SLIM_0_TX Channels" value="One" />
+ <ctl name="ADC MUX7" value="DMIC" />
+ <ctl name="DMIC MUX7" value="DMIC5" />
</path>
<path name="speaker">
@@ -1459,11 +1493,11 @@
</path>
<path name="speaker-mic">
- <path name="dmic3" />
+ <path name="dmic2" />
</path>
<path name="speaker-mic-liquid">
- <path name="dmic3" />
+ <path name="dmic2" />
</path>
<path name="speaker-mic-sbc">
@@ -1512,7 +1546,7 @@
</path>
<path name="handset-mic">
- <path name="dmic1" />
+ <path name="dmic3" />
</path>
<path name="handset-mic-db">
@@ -1526,6 +1560,19 @@
</path>
<path name="three-mic">
+ <ctl name="AIF1_CAP Mixer SLIM TX5" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
+ <ctl name="SLIM_0_TX Channels" value="Three" />
+ <ctl name="CDC_IF TX5 MUX" value="DEC5" />
+ <ctl name="ADC MUX5" value="DMIC" />
+ <ctl name="DMIC MUX5" value="DMIC0" />
+ <ctl name="CDC_IF TX6 MUX" value="DEC6" />
+ <ctl name="ADC MUX6" value="DMIC" />
+ <ctl name="DMIC MUX6" value="DMIC2" />
+ <ctl name="CDC_IF TX8 MUX" value="DEC8" />
+ <ctl name="ADC MUX8" value="DMIC" />
+ <ctl name="DMIC MUX8" value="DMIC5" />
</path>
<path name="anc-handset">
@@ -1719,9 +1766,27 @@
<!-- Dual MIC devices -->
<path name="handset-dmic-endfire">
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
+ <ctl name="CDC_IF TX7 MUX" value="DEC7" />
+ <ctl name="ADC MUX7" value="DMIC" />
+ <ctl name="DMIC MUX7" value="DMIC2" />
+ <ctl name="CDC_IF TX8 MUX" value="DEC8" />
+ <ctl name="ADC MUX8" value="DMIC" />
+ <ctl name="DMIC MUX8" value="DMIC4" />
+ <ctl name="SLIM_0_TX Channels" value="Two" />
</path>
<path name="speaker-dmic-endfire">
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
+ <ctl name="CDC_IF TX7 MUX" value="DEC7" />
+ <ctl name="ADC MUX7" value="DMIC" />
+ <ctl name="DMIC MUX7" value="DMIC1" />
+ <ctl name="CDC_IF TX8 MUX" value="DEC8" />
+ <ctl name="ADC MUX8" value="DMIC" />
+ <ctl name="DMIC MUX8" value="DMIC5" />
+ <ctl name="SLIM_0_TX Channels" value="Two" />
</path>
<path name="dmic-endfire">
@@ -1785,6 +1850,15 @@
</path>
<path name="speaker-dmic-broadside">
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
+ <ctl name="SLIM_0_TX Channels" value="Two" />
+ <ctl name="CDC_IF TX7 MUX" value="DEC7" />
+ <ctl name="ADC MUX7" value="DMIC" />
+ <ctl name="DMIC MUX7" value="DMIC1" />
+ <ctl name="CDC_IF TX8 MUX" value="DEC8" />
+ <ctl name="ADC MUX8" value="DMIC" />
+ <ctl name="DMIC MUX8" value="DMIC2" />
</path>
<path name="dmic-broadside">
@@ -1797,6 +1871,23 @@
<!-- Quad MIC devices -->
<path name="speaker-qmic">
+ <ctl name="AIF1_CAP Mixer SLIM TX5" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
+ <ctl name="SLIM_0_TX Channels" value="Four" />
+ <ctl name="CDC_IF TX5 MUX" value="DEC5" />
+ <ctl name="ADC MUX5" value="DMIC" />
+ <ctl name="DMIC MUX5" value="DMIC1" />
+ <ctl name="CDC_IF TX6 MUX" value="DEC6" />
+ <ctl name="ADC MUX6" value="DMIC" />
+ <ctl name="DMIC MUX6" value="DMIC0" />
+ <ctl name="CDC_IF TX7 MUX" value="DEC7" />
+ <ctl name="ADC MUX7" value="DMIC" />
+ <ctl name="DMIC MUX7" value="DMIC2" />
+ <ctl name="CDC_IF TX8 MUX" value="DEC8" />
+ <ctl name="ADC MUX8" value="DMIC" />
+ <ctl name="DMIC MUX8" value="DMIC5" />
</path>
<path name="speaker-qmic-liquid">