mixer_paths: work around loss of BT call audio
Move common voice controls from RX to TX devices to work around
weird AUX_PCM dependency on "QUAT_MI2S_RX Port Mixer SLIM_1_TX"
Bug: 19099854
Change-Id: I8c9d0210c1c6cb925b28ba291adc113c1db2db26
diff --git a/mixer_paths.xml b/mixer_paths.xml
index 094b246..408f268 100644
--- a/mixer_paths.xml
+++ b/mixer_paths.xml
@@ -823,8 +823,6 @@
<path name="voice-handset">
<path name="handset" />
- <!-- Port mixer is common bit for all voice verbs -->
- <ctl name="QUAT_MI2S_RX Port Mixer SLIM_1_TX" value="1" />
</path>
<path name="voice-hac-handset">
@@ -836,9 +834,6 @@
</path>
<path name="voice-speaker">
- <!-- port mixer controls are common to all voice verbs -->
- <ctl name="QUAT_MI2S_RX Port Mixer SLIM_1_TX" value="1" />
- <ctl name="SLIMBUS_3_RX Port Mixer QUAT_MI2S_TX" value="1" />
<!-- Disable earpiece mode -->
<ctl name="BOOST earpiece mode" value="Off" />
<!-- Enable Mixer to power up Left IC -->
@@ -850,6 +845,9 @@
<path name="voice-speaker-mic">
<path name="speaker-mic" />
+ <!-- port mixer controls are common to all voice verbs -->
+ <ctl name="QUAT_MI2S_RX Port Mixer SLIM_1_TX" value="1" />
+ <ctl name="SLIMBUS_3_RX Port Mixer QUAT_MI2S_TX" value="1" />
</path>
<path name="voice-headphones">
@@ -888,19 +886,19 @@
</path>
<path name="bt-sco-headset">
+ </path>
+
+ <path name="bt-sco-mic">
<ctl name="SLIMBUS_1_RX Port Mixer AUX_PCM_UL_TX" value="1" />
<ctl name="AUX_PCM_RX Port Mixer SLIM_1_TX" value="1" />
<ctl name="SLIMBUS_3_RX Port Mixer AUX_PCM_RX" value="1" />
</path>
- <path name="bt-sco-mic">
- </path>
-
<path name="bt-sco-headset-wb">
- <path name="bt-sco-headset" />
</path>
<path name="bt-sco-mic-wb">
+ <path name="bt-sco-mic" />
</path>
<path name="usb-headset-mic">
@@ -908,6 +906,9 @@
<!-- Dual MIC devices -->
<path name="voice-dmic-ef">
+ <!-- Port mixer is common bit for all voice verbs -->
+ <ctl name="QUAT_MI2S_RX Port Mixer SLIM_1_TX" value="1" />
+
<ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
<ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
<ctl name="AIF2_CAP Mixer SLIM TX9" value="1" />
@@ -992,11 +993,11 @@
<path name="voice-rx">
<ctl name="SLIMBUS_1_RX Port Mixer AFE_PCM_TX" value="1" />
+ <ctl name="AFE_PCM_RX Port Mixer SLIM_1_TX" value="1" />
+ <ctl name="SLIMBUS_3_RX Port Mixer AFE_PCM_RX" value="1" />
</path>
<path name="voice-tx">
- <ctl name="AFE_PCM_RX Port Mixer SLIM_1_TX" value="1" />
- <ctl name="SLIMBUS_3_RX Port Mixer AFE_PCM_RX" value="1" />
</path>
</mixer>
