hal: Remove unused voice mixer controls
The Voice FEs mixer controls Voice, Voice2, QCHAT, and VoLTE
are not used anymore with single voice session feature.
Remove unused voice mixer controls from mixer path files.
Change-Id: Ic663b4a1bd160b69f1699a27913ede18d1550a48
CRs-Fixed: 1006890
diff --git a/configs/msmcobalt/audio_platform_info.xml b/configs/msmcobalt/audio_platform_info.xml
index a0caa13..72ed9f3 100644
--- a/configs/msmcobalt/audio_platform_info.xml
+++ b/configs/msmcobalt/audio_platform_info.xml
@@ -47,14 +47,6 @@
<usecase name="USECASE_VOICEMMODE1_CALL" type="out" id="2"/>
<usecase name="USECASE_VOICEMMODE2_CALL" type="in" id="19"/>
<usecase name="USECASE_VOICEMMODE2_CALL" type="out" id="19"/>
- <usecase name="USECASE_VOICE_CALL" type="in" id="43"/>
- <usecase name="USECASE_VOICE_CALL" type="out" id="43"/>
- <usecase name="USECASE_VOICE2_CALL" type="in" id="44"/>
- <usecase name="USECASE_VOICE2_CALL" type="out" id="44"/>
- <usecase name="USECASE_VOLTE_CALL" type="in" id="-1"/>
- <usecase name="USECASE_VOLTE_CALL" type="out" id="-1"/>
- <usecase name="USECASE_QCHAT_CALL" type="in" id="-1"/>
- <usecase name="USECASE_QCHAT_CALL" type="out" id="-1"/>
<usecase name="USECASE_VOWLAN_CALL" type="in" id="-1"/>
<usecase name="USECASE_VOWLAN_CALL" type="out" id="-1"/>
<usecase name="USECASE_AUDIO_PLAYBACK_FM" type="out" id="5"/>
diff --git a/configs/msmcobalt/mixer_paths.xml b/configs/msmcobalt/mixer_paths.xml
index 1a895fe..8fb14cc 100644
--- a/configs/msmcobalt/mixer_paths.xml
+++ b/configs/msmcobalt/mixer_paths.xml
@@ -220,46 +220,6 @@
<ctl name="MultiMedia2 Mixer TERT_MI2S_TX" value="0" />
<!-- fm end -->
- <!-- Voice -->
- <ctl name="SLIM_0_RX_Voice Mixer CSVoice" value="0" />
- <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="0" />
- <!-- Voice HDMI -->
- <ctl name="HDMI_RX_Voice Mixer CSVoice" value="0" />
- <!-- Voice BTSCO -->
- <ctl name="AUX PCM SampleRate" value="8000" />
- <ctl name="AUX_PCM_RX_Voice Mixer CSVoice" value="0" />
- <ctl name="Voice_Tx Mixer AUX_PCM_TX_Voice" value="0" />
- <!-- Voice USB headset -->
- <ctl name="AFE_PCM_RX_Voice Mixer CSVoice" value="0" />
- <ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="0" />
- <!-- Voice end-->
-
- <!-- Voice2 -->
- <ctl name="SLIM_0_RX_Voice Mixer Voice2" value="0" />
- <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="0" />
- <!-- Voice2 HDMI -->
- <ctl name="HDMI_RX_Voice Mixer Voice2" value="0" />
- <!-- Voice2 BTSCO -->
- <ctl name="AUX_PCM_RX_Voice Mixer Voice2" value="0" />
- <ctl name="Voice2_Tx Mixer AUX_PCM_TX_Voice2" value="0" />
- <!-- Voice2 USB headset -->
- <ctl name="AFE_PCM_RX_Voice Mixer Voice2" value="0" />
- <ctl name="Voice2_Tx Mixer AFE_PCM_TX_Voice2" value="0" />
- <!-- Voice2 end-->
-
- <!-- VoLTE -->
- <ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="0" />
- <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="0" />
- <!-- VoLTE HDMI -->
- <ctl name="HDMI_RX_Voice Mixer VoLTE" value="0" />
- <!-- VoLTE BTSCO -->
- <ctl name="AUX_PCM_RX_Voice Mixer VoLTE" value="0" />
- <ctl name="VoLTE_Tx Mixer AUX_PCM_TX_VoLTE" value="0" />
- <!-- VoLTE USB headset -->
- <ctl name="AFE_PCM_RX_Voice Mixer VoLTE" value="0" />
- <ctl name="VoLTE_Tx Mixer AFE_PCM_TX_VoLTE" value="0" />
- <!-- VoLTE end-->
-
<!-- Multimode Voice1 -->
<ctl name="SLIM_0_RX_Voice Mixer VoiceMMode1" value="0" />
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="0" />
@@ -312,13 +272,6 @@
<ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value="0" />
<!-- compress-voip-call end-->
- <!-- QCHAT start -->
- <ctl name="SLIM_0_RX_Voice Mixer QCHAT" value="0" />
- <ctl name="QCHAT_Tx Mixer SLIM_0_TX_QCHAT" value="0" />
- <ctl name="AUX_PCM_RX_Voice Mixer QCHAT" value="0" />
- <ctl name="QCHAT_Tx Mixer AUX_PCM_TX_QCHAT" value="0" />
- <!-- QCHAT end-->
-
<!-- VoWLAN start -->
<ctl name="SLIM_0_RX_Voice Mixer VoWLAN" value="0" />
<ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="0" />
@@ -929,69 +882,6 @@
<path name="afe-proxy-record afe-proxy">
</path>
- <path name="voice-call">
- <ctl name="SLIM_0_RX_Voice Mixer CSVoice" value="1" />
- <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="1" />
- </path>
-
- <path name="voice-call hdmi">
- <ctl name="HDMI_RX_Voice Mixer CSVoice" value="1" />
- <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="1" />
- </path>
-
- <path name="voice-call bt-sco">
- <ctl name="AUX_PCM_RX_Voice Mixer CSVoice" value="1" />
- <ctl name="Voice_Tx Mixer AUX_PCM_TX_Voice" value="1" />
- </path>
-
- <path name="voice-call bt-sco-wb">
- <ctl name="AUX PCM SampleRate" value="16000" />
- <path name="voice-call bt-sco" />
- </path>
-
- <path name="voice-call afe-proxy">
- <ctl name="AFE_PCM_RX_Voice Mixer CSVoice" value="1" />
- <ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="1" />
- </path>
-
- <path name="voice-call usb-headphones">
- <ctl name="AFE_PCM_RX_Voice Mixer CSVoice" value="1" />
- <ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="1" />
- </path>
-
- <path name="voice2-call">
- <ctl name="SLIM_0_RX_Voice Mixer Voice2" value="1" />
- <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
- </path>
-
- <path name="voice2-call hdmi">
- <ctl name="HDMI_RX_Voice Mixer Voice2" value="1" />
- <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
- </path>
-
- <path name="voice2-call bt-sco">
- <ctl name="AUX_PCM_RX_Voice Mixer Voice2" value="1" />
- <ctl name="Voice2_Tx Mixer AUX_PCM_TX_Voice2" value="1" />
- </path>
-
- <path name="voice2-call bt-sco-wb">
- <ctl name="AUX PCM SampleRate" value="16000" />
- <path name="voice2-call bt-sco" />
- </path>
-
- <path name="voice2-call afe-proxy">
- <ctl name="AFE_PCM_RX_Voice Mixer Voice2" value="1" />
- <ctl name="Voice2_Tx Mixer AFE_PCM_TX_Voice2" value="1" />
- </path>
-
- <path name="voice2-call usb-headphones">
- <ctl name="AFE_PCM_RX_Voice Mixer Voice2" value="1" />
- <ctl name="Voice2_Tx Mixer AFE_PCM_TX_Voice2" value="1" />
- </path>
-
- <path name="voice2-call speaker-protected">
- </path>
-
<path name="play-fm">
<ctl name="Tert MI2S LOOPBACK Volume" value="1" />
<ctl name="SLIMBUS_0_RX Port Mixer TERT_MI2S_TX" value="1" />
@@ -1181,39 +1071,6 @@
<path name="hfp-sco" />
</path>
- <path name="volte-call">
- <ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="1" />
- <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
- </path>
-
- <path name="volte-call hdmi">
- <ctl name="HDMI_RX_Voice Mixer VoLTE" value="1" />
- <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
- </path>
-
- <path name="volte-call bt-sco">
- <ctl name="AUX_PCM_RX_Voice Mixer VoLTE" value="1" />
- <ctl name="VoLTE_Tx Mixer AUX_PCM_TX_VoLTE" value="1" />
- </path>
-
- <path name="volte-call bt-sco-wb">
- <ctl name="AUX PCM SampleRate" value="16000" />
- <path name="volte-call bt-sco" />
- </path>
-
- <path name="volte-call afe-proxy">
- <ctl name="AFE_PCM_RX_Voice Mixer VoLTE" value="1" />
- <ctl name="VoLTE_Tx Mixer AFE_PCM_TX_VoLTE" value="1" />
- </path>
-
- <path name="volte-call usb-headphones">
- <ctl name="AFE_PCM_RX_Voice Mixer VoLTE" value="1" />
- <ctl name="VoLTE_Tx Mixer AFE_PCM_TX_VoLTE" value="1" />
- </path>
-
- <path name="volte-call speaker-protected">
- </path>
-
<path name="compress-voip-call">
<ctl name="SLIM_0_RX_Voice Mixer Voip" value="1" />
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
@@ -1282,21 +1139,6 @@
<path name="spkr-vi-record">
</path>
- <path name="qchat-call">
- <ctl name="SLIM_0_RX_Voice Mixer QCHAT" value="1" />
- <ctl name="QCHAT_Tx Mixer SLIM_0_TX_QCHAT" value="1" />
- </path>
-
- <path name="qchat-call bt-sco">
- <ctl name="AUX_PCM_RX_Voice Mixer QCHAT" value="1" />
- <ctl name="QCHAT_Tx Mixer AUX_PCM_TX_QCHAT" value="1" />
- </path>
-
- <path name="qchat-call bt-sco-wb">
- <ctl name="AUX PCM SampleRate" value="16000" />
- <path name="qchat-call bt-sco" />
- </path>
-
<path name="vowlan-call">
<ctl name="SLIM_0_RX_Voice Mixer VoWLAN" value="1" />
<ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
diff --git a/configs/msmcobalt/mixer_paths_dtp.xml b/configs/msmcobalt/mixer_paths_dtp.xml
index 811ecf6..9bcf15b 100644
--- a/configs/msmcobalt/mixer_paths_dtp.xml
+++ b/configs/msmcobalt/mixer_paths_dtp.xml
@@ -338,46 +338,6 @@
<ctl name="MultiMedia2 Mixer TERT_MI2S_TX" value="0" />
<!-- fm end -->
- <!-- Voice -->
- <ctl name="SLIM_0_RX_Voice Mixer CSVoice" value="0" />
- <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="0" />
- <!-- Voice HDMI -->
- <ctl name="HDMI_RX_Voice Mixer CSVoice" value="0" />
- <!-- Voice BTSCO -->
- <ctl name="AUX PCM SampleRate" value="8000" />
- <ctl name="AUX_PCM_RX_Voice Mixer CSVoice" value="0" />
- <ctl name="Voice_Tx Mixer AUX_PCM_TX_Voice" value="0" />
- <!-- Voice USB headset -->
- <ctl name="AFE_PCM_RX_Voice Mixer CSVoice" value="0" />
- <ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="0" />
- <!-- Voice end-->
-
- <!-- Voice2 -->
- <ctl name="SLIM_0_RX_Voice Mixer Voice2" value="0" />
- <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="0" />
- <!-- Voice2 HDMI -->
- <ctl name="HDMI_RX_Voice Mixer Voice2" value="0" />
- <!-- Voice2 BTSCO -->
- <ctl name="AUX_PCM_RX_Voice Mixer Voice2" value="0" />
- <ctl name="Voice2_Tx Mixer AUX_PCM_TX_Voice2" value="0" />
- <!-- Voice2 USB headset -->
- <ctl name="AFE_PCM_RX_Voice Mixer Voice2" value="0" />
- <ctl name="Voice2_Tx Mixer AFE_PCM_TX_Voice2" value="0" />
- <!-- Voice2 end-->
-
- <!-- VoLTE -->
- <ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="0" />
- <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="0" />
- <!-- VoLTE HDMI -->
- <ctl name="HDMI_RX_Voice Mixer VoLTE" value="0" />
- <!-- VoLTE BTSCO -->
- <ctl name="AUX_PCM_RX_Voice Mixer VoLTE" value="0" />
- <ctl name="VoLTE_Tx Mixer AUX_PCM_TX_VoLTE" value="0" />
- <!-- VoLTE USB headset -->
- <ctl name="AFE_PCM_RX_Voice Mixer VoLTE" value="0" />
- <ctl name="VoLTE_Tx Mixer AFE_PCM_TX_VoLTE" value="0" />
- <!-- VoLTE end-->
-
<!-- Multimode Voice1 -->
<ctl name="SLIM_0_RX_Voice Mixer VoiceMMode1" value="0" />
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="0" />
@@ -436,13 +396,6 @@
<ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value="0" />
<!-- compress-voip-call end-->
- <!-- QCHAT start -->
- <ctl name="SLIM_0_RX_Voice Mixer QCHAT" value="0" />
- <ctl name="QCHAT_Tx Mixer SLIM_0_TX_QCHAT" value="0" />
- <ctl name="AUX_PCM_RX_Voice Mixer QCHAT" value="0" />
- <ctl name="QCHAT_Tx Mixer AUX_PCM_TX_QCHAT" value="0" />
- <!-- QCHAT end-->
-
<!-- VoWLAN start -->
<ctl name="SLIM_0_RX_Voice Mixer VoWLAN" value="0" />
<ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="0" />
@@ -1174,76 +1127,6 @@
<ctl name="MultiMedia2 Mixer TERT_MI2S_TX" value="1" />
</path>
- <path name="voice-call">
- <ctl name="SLIM_0_RX_Voice Mixer CSVoice" value="1" />
- <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="1" />
- </path>
-
- <path name="voice-call hdmi">
- <ctl name="HDMI_RX_Voice Mixer CSVoice" value="1" />
- <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="1" />
- </path>
-
- <path name="voice-call bt-sco">
- <ctl name="AUX_PCM_RX_Voice Mixer CSVoice" value="1" />
- <ctl name="Voice_Tx Mixer AUX_PCM_TX_Voice" value="1" />
- </path>
-
- <path name="voice-call bt-sco-wb">
- <ctl name="AUX PCM SampleRate" value="16000" />
- <path name="voice-call bt-sco" />
- </path>
-
- <path name="voice-call afe-proxy">
- <ctl name="AFE_PCM_RX_Voice Mixer CSVoice" value="1" />
- <ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="1" />
- </path>
-
- <path name="voice-call usb-headphones">
- <ctl name="AFE_PCM_RX_Voice Mixer CSVoice" value="1" />
- <ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="1" />
- </path>
-
- <path name="voice2-call">
- <ctl name="SLIM_0_RX_Voice Mixer Voice2" value="1" />
- <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
- </path>
-
- <path name="voice-call voice-speaker-vbat">
- <path name="echo-reference speaker-vbat-mono" />
- <path name="voice-call"/>
- </path>
-
- <path name="voice2-call hdmi">
- <ctl name="HDMI_RX_Voice Mixer Voice2" value="1" />
- <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
- </path>
-
- <path name="voice2-call bt-sco">
- <ctl name="AUX_PCM_RX_Voice Mixer Voice2" value="1" />
- <ctl name="Voice2_Tx Mixer AUX_PCM_TX_Voice2" value="1" />
- </path>
-
- <path name="voice2-call bt-sco-wb">
- <ctl name="AUX PCM SampleRate" value="16000" />
- <path name="voice2-call bt-sco" />
- </path>
-
- <path name="voice2-call afe-proxy">
- <ctl name="AFE_PCM_RX_Voice Mixer Voice2" value="1" />
- <ctl name="Voice2_Tx Mixer AFE_PCM_TX_Voice2" value="1" />
- </path>
-
- <path name="voice2-call usb-headphones">
- <ctl name="AFE_PCM_RX_Voice Mixer Voice2" value="1" />
- <ctl name="Voice2_Tx Mixer AFE_PCM_TX_Voice2" value="1" />
- </path>
-
- <path name="voice2-call voice-speaker-vbat">
- <path name="echo-reference speaker-vbat-mono" />
- <path name="voice2-call"/>
- </path>
-
<path name="play-fm">
<ctl name="Tert MI2S LOOPBACK Volume" value="1" />
<ctl name="SLIMBUS_0_RX Port Mixer TERT_MI2S_TX" value="1" />
@@ -1389,41 +1272,6 @@
<path name="hfp-sco" />
</path>
- <path name="volte-call">
- <ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="1" />
- <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
- </path>
-
- <path name="volte-call hdmi">
- <ctl name="HDMI_RX_Voice Mixer VoLTE" value="1" />
- <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
- </path>
-
- <path name="volte-call bt-sco">
- <ctl name="AUX_PCM_RX_Voice Mixer VoLTE" value="1" />
- <ctl name="VoLTE_Tx Mixer AUX_PCM_TX_VoLTE" value="1" />
- </path>
-
- <path name="volte-call bt-sco-wb">
- <ctl name="AUX PCM SampleRate" value="16000" />
- <path name="volte-call bt-sco" />
- </path>
-
- <path name="volte-call afe-proxy">
- <ctl name="AFE_PCM_RX_Voice Mixer VoLTE" value="1" />
- <ctl name="VoLTE_Tx Mixer AFE_PCM_TX_VoLTE" value="1" />
- </path>
-
- <path name="volte-call usb-headphones">
- <ctl name="AFE_PCM_RX_Voice Mixer VoLTE" value="1" />
- <ctl name="VoLTE_Tx Mixer AFE_PCM_TX_VoLTE" value="1" />
- </path>
-
- <path name="volte-call voice-speaker-vbat">
- <path name="echo-reference speaker-vbat-mono" />
- <path name="volte-call"/>
- </path>
-
<path name="compress-voip-call">
<ctl name="SLIM_0_RX_Voice Mixer Voip" value="1" />
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
diff --git a/configs/msmcobalt/mixer_paths_i2s.xml b/configs/msmcobalt/mixer_paths_i2s.xml
index a810ee2..39744a8 100644
--- a/configs/msmcobalt/mixer_paths_i2s.xml
+++ b/configs/msmcobalt/mixer_paths_i2s.xml
@@ -68,31 +68,6 @@
<ctl name="SLIM RX3 MUX" value="AIF1_PB" />
<ctl name="CLASS_H_DSM MUX" value="ZERO" />
- <!-- Voice -->
- <ctl name="Voice Stub Tx Mixer PRI_MI2S_TX" value="0" />
- <ctl name="QUAT_MI2S_RX_Voice Mixer Voice Stub" value="0" />
- <ctl name="Voice Stub Tx Mixer QUAT_MI2S_TX" value="0" />
- <ctl name="PRI_MI2S_RX_Voice Mixer Voice Stub" value="0" />
- <ctl name="QUAT_MI2S_RX Port Mixer PRI_MI2S_TX" value="0" />
- <ctl name="PRI_MI2S_RX Port Mixer QUAT_MI2S_TX" value="0" />
- <!-- Voice end-->
- <!-- VoLTE -->
- <ctl name="VoLTE Stub Tx Mixer PRI_MI2S_TX" value="0" />
- <ctl name="QUAT_MI2S_RX_Voice Mixer VoLTE Stub" value="0" />
- <ctl name="VoLTE Stub Tx Mixer QUAT_MI2S_TX" value="0" />
- <ctl name="PRI_MI2S_RX_Voice Mixer VoLTE Stub" value="0" />
- <ctl name="QUAT_MI2S_RX Port Mixer PRI_MI2S_TX" value="0" />
- <ctl name="PRI_MI2S_RX Port Mixer QUAT_MI2S_TX" value="0" />
- <!-- VoLTE end-->
- <!-- Voice2 -->
- <ctl name="Voice2 Stub Tx Mixer PRI_MI2S_TX" value="0" />
- <ctl name="QUAT_MI2S_RX_Voice Mixer Voice2 Stub" value="0" />
- <ctl name="Voice2 Stub Tx Mixer QUAT_MI2S_TX" value="0" />
- <ctl name="PRI_MI2S_RX_Voice Mixer Voice2 Stub" value="0" />
- <ctl name="QUAT_MI2S_RX Port Mixer PRI_MI2S_TX" value="0" />
- <ctl name="PRI_MI2S_RX Port Mixer QUAT_MI2S_TX" value="0" />
- <!-- Voice2 end-->
-
<!-- RT Proxy Cal -->
<ctl name="RT_PROXY_1_RX SetCalMode" value="CAL_MODE_NONE" />
<ctl name="RT_PROXY_1_TX SetCalMode" value="CAL_MODE_NONE" />
@@ -119,33 +94,6 @@
<ctl name="MultiMedia8 Mixer AUX_PCM_UL_TX" value="1" />
</path>
- <path name="voice-call">
- <ctl name="Voice Stub Tx Mixer PRI_MI2S_TX" value="1" />
- <ctl name="QUAT_MI2S_RX_Voice Mixer Voice Stub" value="1" />
- <ctl name="Voice Stub Tx Mixer QUAT_MI2S_TX" value="1" />
- <ctl name="PRI_MI2S_RX_Voice Mixer Voice Stub" value="1" />
- <ctl name="QUAT_MI2S_RX Port Mixer PRI_MI2S_TX" value="1" />
- <ctl name="PRI_MI2S_RX Port Mixer QUAT_MI2S_TX" value="1" />
- </path>
-
- <path name="volte-call">
- <ctl name="VoLTE Stub Tx Mixer PRI_MI2S_TX" value="1" />
- <ctl name="QUAT_MI2S_RX_Voice Mixer VoLTE Stub" value="1" />
- <ctl name="VoLTE Stub Tx Mixer QUAT_MI2S_TX" value="1" />
- <ctl name="PRI_MI2S_RX_Voice Mixer VoLTE Stub" value="1" />
- <ctl name="QUAT_MI2S_RX Port Mixer PRI_MI2S_TX" value="1" />
- <ctl name="PRI_MI2S_RX Port Mixer QUAT_MI2S_TX" value="1" />
- </path>
-
- <path name="voice2-call">
- <ctl name="Voice2 Stub Tx Mixer PRI_MI2S_TX" value="1" />
- <ctl name="QUAT_MI2S_RX_Voice Mixer Voice2 Stub" value="1" />
- <ctl name="Voice2 Stub Tx Mixer QUAT_MI2S_TX" value="1" />
- <ctl name="PRI_MI2S_RX_Voice Mixer Voice2 Stub" value="1" />
- <ctl name="QUAT_MI2S_RX Port Mixer PRI_MI2S_TX" value="1" />
- <ctl name="PRI_MI2S_RX Port Mixer QUAT_MI2S_TX" value="1" />
- </path>
-
<!-- These are actual sound device specific mixer settings -->
<path name="adc1">
<ctl name="AIF1_CAP Mixer SLIM TX9" value="1"/>
diff --git a/configs/msmcobalt/mixer_paths_tasha.xml b/configs/msmcobalt/mixer_paths_tasha.xml
index 0dcc53a..860d014 100644
--- a/configs/msmcobalt/mixer_paths_tasha.xml
+++ b/configs/msmcobalt/mixer_paths_tasha.xml
@@ -390,49 +390,6 @@
<ctl name="MultiMedia2 Mixer SLIM_8_TX" value="0" />
<!-- fm end -->
- <!-- Voice -->
- <ctl name="SLIM_0_RX_Voice Mixer CSVoice" value="0" />
- <ctl name="SLIM_6_RX_Voice Mixer CSVoice" value="0" />
- <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="0" />
- <!-- Voice HDMI -->
- <ctl name="HDMI_RX_Voice Mixer CSVoice" value="0" />
- <!-- Voice BTSCO -->
- <ctl name="BT_SCO SampleRate" value="8000" />
- <ctl name="SLIM_7_RX_Voice Mixer CSVoice" value="0" />
- <ctl name="Voice_Tx Mixer SLIM_7_TX_Voice" value="0" />
- <!-- Voice USB headset -->
- <ctl name="AFE_PCM_RX_Voice Mixer CSVoice" value="0" />
- <ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="0" />
- <!-- Voice end-->
-
- <!-- Voice2 -->
- <ctl name="SLIM_0_RX_Voice Mixer Voice2" value="0" />
- <ctl name="SLIM_6_RX_Voice Mixer Voice2" value="0" />
- <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="0" />
- <!-- Voice2 HDMI -->
- <ctl name="HDMI_RX_Voice Mixer Voice2" value="0" />
- <!-- Voice2 BTSCO -->
- <ctl name="SLIM_7_RX_Voice Mixer Voice2" value="0" />
- <ctl name="Voice2_Tx Mixer SLIM_7_TX_Voice2" value="0" />
- <!-- Voice2 USB headset -->
- <ctl name="AFE_PCM_RX_Voice Mixer Voice2" value="0" />
- <ctl name="Voice2_Tx Mixer AFE_PCM_TX_Voice2" value="0" />
- <!-- Voice2 end-->
-
- <!-- VoLTE -->
- <ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="0" />
- <ctl name="SLIM_6_RX_Voice Mixer VoLTE" value="0" />
- <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="0" />
- <!-- VoLTE HDMI -->
- <ctl name="HDMI_RX_Voice Mixer VoLTE" value="0" />
- <!-- VoLTE BTSCO -->
- <ctl name="SLIM_7_RX_Voice Mixer VoLTE" value="0" />
- <ctl name="VoLTE_Tx Mixer SLIM_7_TX_VoLTE" value="0" />
- <!-- VoLTE USB headset -->
- <ctl name="AFE_PCM_RX_Voice Mixer VoLTE" value="0" />
- <ctl name="VoLTE_Tx Mixer AFE_PCM_TX_VoLTE" value="0" />
- <!-- VoLTE end-->
-
<!-- Multimode Voice1 -->
<ctl name="SLIM_0_RX_Voice Mixer VoiceMMode1" value="0" />
<ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="0" />
@@ -499,16 +456,6 @@
<ctl name="Voip_Tx Mixer USB_AUDIO_TX_Voip" value="0" />
<!-- compress-voip-call end-->
- <!-- QCHAT start -->
- <ctl name="SLIM_0_RX_Voice Mixer QCHAT" value="0" />
- <ctl name="SLIM_6_RX_Voice Mixer QCHAT" value="0" />
- <ctl name="QCHAT_Tx Mixer SLIM_0_TX_QCHAT" value="0" />
- <ctl name="SLIM_7_RX_Voice Mixer QCHAT" value="0" />
- <ctl name="QCHAT_Tx Mixer SLIM_7_TX_QCHAT" value="0" />
- <ctl name="USB_AUDIO_RX_Voice Mixer QCHAT" value="0" />
- <ctl name="QCHAT_Tx Mixer USB_AUDIO_TX_QCHAT" value="0" />
- <!-- QCHAT end-->
-
<!-- VoWLAN start -->
<ctl name="SLIM_0_RX_Voice Mixer VoWLAN" value="0" />
<ctl name="SLIM_6_RX_Voice Mixer VoWLAN" value="0" />
@@ -1295,86 +1242,6 @@
<ctl name="MultiMedia2 Mixer SLIM_8_TX" value="1" />
</path>
- <path name="voice-call">
- <ctl name="SLIM_0_RX_Voice Mixer CSVoice" value="1" />
- <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="1" />
- </path>
-
- <path name="voice-call hdmi">
- <ctl name="HDMI_RX_Voice Mixer CSVoice" value="1" />
- <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="1" />
- </path>
-
- <path name="voice-call bt-sco">
- <ctl name="SLIM_7_RX_Voice Mixer CSVoice" value="1" />
- <ctl name="Voice_Tx Mixer SLIM_7_TX_Voice" value="1" />
- </path>
-
- <path name="voice-call bt-sco-wb">
- <ctl name="BT_SCO SampleRate" value="16000" />
- <path name="voice-call bt-sco" />
- </path>
-
- <path name="voice-call afe-proxy">
- <ctl name="AFE_PCM_RX_Voice Mixer CSVoice" value="1" />
- <ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="1" />
- </path>
-
- <path name="voice-call usb-headphones">
- <ctl name="USB_AUDIO_RX_Voice Mixer CSVoice" value="1" />
- <ctl name="Voice_Tx Mixer USB_AUDIO_TX_Voice" value="1" />
- </path>
-
- <path name="voice-call headphones">
- <ctl name="SLIM_6_RX_Voice Mixer CSVoice" value="1" />
- <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="1" />
- </path>
-
- <path name="voice2-call">
- <ctl name="SLIM_0_RX_Voice Mixer Voice2" value="1" />
- <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
- </path>
-
- <path name="voice-call voice-speaker-vbat">
- <path name="echo-reference speaker-vbat-mono" />
- <path name="voice-call"/>
- </path>
-
- <path name="voice2-call hdmi">
- <ctl name="HDMI_RX_Voice Mixer Voice2" value="1" />
- <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
- </path>
-
- <path name="voice2-call bt-sco">
- <ctl name="SLIM_7_RX_Voice Mixer Voice2" value="1" />
- <ctl name="Voice2_Tx Mixer SLIM_7_TX_Voice2" value="1" />
- </path>
-
- <path name="voice2-call bt-sco-wb">
- <ctl name="BT_SCO SampleRate" value="16000" />
- <path name="voice2-call bt-sco" />
- </path>
-
- <path name="voice2-call afe-proxy">
- <ctl name="AFE_PCM_RX_Voice Mixer Voice2" value="1" />
- <ctl name="Voice2_Tx Mixer AFE_PCM_TX_Voice2" value="1" />
- </path>
-
- <path name="voice2-call usb-headphones">
- <ctl name="USB_AUDIO_RX_Voice Mixer Voice2" value="1" />
- <ctl name="Voice2_Tx Mixer USB_AUDIO_TX_Voice2" value="1" />
- </path>
-
- <path name="voice2-call voice-speaker-vbat">
- <path name="echo-reference speaker-vbat-mono" />
- <path name="voice2-call"/>
- </path>
-
- <path name="voice2-call headphones">
- <ctl name="SLIM_6_RX_Voice Mixer Voice2" value="1" />
- <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
- </path>
-
<path name="play-fm">
<ctl name="SLIMBUS_8 LOOPBACK Volume" value="1" />
<ctl name="SLIMBUS_0_RX Port Mixer SLIM_8_TX" value="1" />
@@ -1535,46 +1402,6 @@
<path name="hfp-sco headphones" />
</path>
- <path name="volte-call">
- <ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="1" />
- <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
- </path>
-
- <path name="volte-call headphones">
- <ctl name="SLIM_6_RX_Voice Mixer VoLTE" value="1" />
- <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
- </path>
-
- <path name="volte-call hdmi">
- <ctl name="HDMI_RX_Voice Mixer VoLTE" value="1" />
- <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
- </path>
-
- <path name="volte-call bt-sco">
- <ctl name="SLIM_7_RX_Voice Mixer VoLTE" value="1" />
- <ctl name="VoLTE_Tx Mixer SLIM_7_TX_VoLTE" value="1" />
- </path>
-
- <path name="volte-call bt-sco-wb">
- <ctl name="BT_SCO SampleRate" value="16000" />
- <path name="volte-call bt-sco" />
- </path>
-
- <path name="volte-call afe-proxy">
- <ctl name="AFE_PCM_RX_Voice Mixer VoLTE" value="1" />
- <ctl name="VoLTE_Tx Mixer AFE_PCM_TX_VoLTE" value="1" />
- </path>
-
- <path name="volte-call usb-headphones">
- <ctl name="USB_AUDIO_RX_Voice Mixer VoLTE" value="1" />
- <ctl name="VoLTE_Tx Mixer USB_AUDIO_TX_VoLTE" value="1" />
- </path>
-
- <path name="volte-call voice-speaker-vbat">
- <path name="echo-reference speaker-vbat-mono" />
- <path name="volte-call"/>
- </path>
-
<path name="compress-voip-call">
<ctl name="SLIM_0_RX_Voice Mixer Voip" value="1" />
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />