hal: config: cobalt: Add the support for USB audio via ADSP
Update the audio path and policy configuration to support
USB audio via ADSP.
CRs-Fixed: 1019158
Change-Id: I33f25bf7a48870fdd32dca04fa818294b90fd70f
diff --git a/configs/msmcobalt/mixer_paths_tasha.xml b/configs/msmcobalt/mixer_paths_tasha.xml
index 14bba4e..f60a036 100644
--- a/configs/msmcobalt/mixer_paths_tasha.xml
+++ b/configs/msmcobalt/mixer_paths_tasha.xml
@@ -173,6 +173,28 @@
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia16" value="0" />
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="0" />
<ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="0" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia1" value="0" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia2" value="0" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia3" value="0" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia5" value="0" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia7" value="0" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="0" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia11" value="0" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia12" value="0" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia13" value="0" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="0" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="0" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="0" />
+ <ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="0" />
+ <ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />
+ <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />
+ <ctl name="USB_AUDIO_RX Channels" value="One" />
+ <ctl name="USB_AUDIO_RX SampleRate" value="KHZ_48" />
+ <ctl name="USB_AUDIO_RX Format" value="S16_LE" />
+ <ctl name="USB_AUDIO_TX Channels" value="One" />
+ <ctl name="USB_AUDIO_TX SampleRate" value="KHZ_48" />
+ <ctl name="USB_AUDIO_TX Format" value="S16_LE" />
<ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />
<ctl name="IIR0 INP0 MUX" value="ZERO" />
<ctl name="IIR0 INP1 MUX" value="ZERO" />
@@ -419,6 +441,8 @@
<!-- Multimode Voice1 USB headset -->
<ctl name="AFE_PCM_RX_Voice Mixer VoiceMMode1" value="0" />
<ctl name="VoiceMMode1_Tx Mixer AFE_PCM_TX_MMode1" value="0" />
+ <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode1" value="0" />
+ <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="0" />
<!-- Miltimode Voice1 end-->
<!-- Multimode Voice2 -->
@@ -433,6 +457,8 @@
<!-- Multimode Voice2 USB headset -->
<ctl name="AFE_PCM_RX_Voice Mixer VoiceMMode2" value="0" />
<ctl name="VoiceMMode2_Tx Mixer AFE_PCM_TX_MMode2" value="0" />
+ <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="0" />
+ <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="0" />
<!-- Multimode Voice2 end-->
<!-- Voice external ec. reference -->
@@ -466,6 +492,8 @@
<ctl name="Voip_Tx Mixer SLIM_7_TX_Voip" value="0" />
<ctl name="AFE_PCM_RX_Voice Mixer Voip" value="0" />
<ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value="0" />
+ <ctl name="USB_AUDIO_RX_Voice Mixer Voip" value="0" />
+ <ctl name="Voip_Tx Mixer USB_AUDIO_TX_Voip" value="0" />
<!-- compress-voip-call end-->
<!-- QCHAT start -->
@@ -474,6 +502,8 @@
<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 -->
@@ -485,6 +515,8 @@
<ctl name="VoWLAN_Tx Mixer SLIM_7_TX_VoWLAN" value="0" />
<ctl name="AFE_PCM_RX_Voice Mixer VoWLAN" value="0" />
<ctl name="VoWLAN_Tx Mixer AFE_PCM_TX_VoWLAN" value="0" />
+ <ctl name="USB_AUDIO_RX_Voice Mixer VoWLAN" value="0" />
+ <ctl name="VoWLAN_Tx Mixer USB_AUDIO_TX_VoWLAN" value="0" />
<!-- VoWLAN end-->
<!-- Audio BTSCO -->
@@ -641,7 +673,7 @@
</path>
<path name="deep-buffer-playback usb-headphones">
- <path name="deep-buffer-playback afe-proxy" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia1" value="1" />
</path>
<path name="deep-buffer-playback speaker-and-usb-headphones">
@@ -689,7 +721,7 @@
</path>
<path name="low-latency-playback usb-headphones">
- <path name="low-latency-playback afe-proxy" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia5" value="1" />
</path>
<path name="low-latency-playback speaker-and-usb-headphones">
@@ -744,6 +776,11 @@
<path name="audio-ull-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia3" value="1" />
</path>
+
+ <path name="audio-ull-playback usb-headphones">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia3" value="1" />
+ </path>
+
<path name="multi-channel-playback hdmi">
<ctl name="HDMI Mixer MultiMedia2" value="1" />
</path>
@@ -783,7 +820,7 @@
</path>
<path name="compress-offload-playback usb-headphones">
- <path name="compress-offload-playback afe-proxy" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia4" value="1" />
</path>
<path name="compress-offload-playback speaker-and-usb-headphones">
@@ -831,7 +868,7 @@
</path>
<path name="compress-offload-playback2 usb-headphones">
- <path name="compress-offload-playback2 afe-proxy" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia7" value="1" />
</path>
<path name="compress-offload-playback2 speaker-and-usb-headphones">
@@ -879,7 +916,7 @@
</path>
<path name="compress-offload-playback3 usb-headphones">
- <path name="compress-offload-playback3 afe-proxy" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
</path>
<path name="compress-offload-playback3 speaker-and-usb-headphones">
@@ -927,7 +964,7 @@
</path>
<path name="compress-offload-playback4 usb-headphones">
- <path name="compress-offload-playback4 afe-proxy" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia11" value="1" />
</path>
<path name="compress-offload-playback4 speaker-and-usb-headphones">
@@ -975,7 +1012,7 @@
</path>
<path name="compress-offload-playback5 usb-headphones">
- <path name="compress-offload-playback5 afe-proxy" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia12" value="1" />
</path>
<path name="compress-offload-playback5 speaker-and-usb-headphones">
@@ -1023,7 +1060,7 @@
</path>
<path name="compress-offload-playback6 usb-headphones">
- <path name="compress-offload-playback6 afe-proxy" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia13" value="1" />
</path>
<path name="compress-offload-playback6 speaker-and-usb-headphones">
@@ -1071,7 +1108,7 @@
</path>
<path name="compress-offload-playback7 usb-headphones">
- <path name="compress-offload-playback7 afe-proxy" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="1" />
</path>
<path name="compress-offload-playback7 speaker-and-usb-headphones">
@@ -1119,7 +1156,7 @@
</path>
<path name="compress-offload-playback8 usb-headphones">
- <path name="compress-offload-playback8 afe-proxy" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="1" />
</path>
<path name="compress-offload-playback8 speaker-and-usb-headphones">
@@ -1167,7 +1204,7 @@
</path>
<path name="compress-offload-playback9 usb-headphones">
- <path name="compress-offload-playback9 afe-proxy" />
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="1" />
</path>
<path name="compress-offload-playback9 speaker-and-usb-headphones">
@@ -1193,7 +1230,7 @@
</path>
<path name="audio-record usb-headset-mic">
- <ctl name="MultiMedia1 Mixer AFE_PCM_TX" value="1" />
+ <ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="1" />
</path>
<path name="audio-record bt-sco">
@@ -1223,7 +1260,7 @@
</path>
<path name="audio-record-compress usb-headset-mic">
- <ctl name="MultiMedia8 Mixer AFE_PCM_TX" value="1" />
+ <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="1" />
</path>
<path name="low-latency-record">
@@ -1240,7 +1277,7 @@
</path>
<path name="low-latency-record usb-headset-mic">
- <ctl name="MultiMedia5 Mixer AFE_PCM_TX" value="1" />
+ <ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="1" />
</path>
<path name="low-latency-record capture-fm">
@@ -1277,8 +1314,8 @@
</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" />
+ <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">
@@ -1317,8 +1354,8 @@
</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" />
+ <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">
@@ -1522,8 +1559,8 @@
</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" />
+ <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">
@@ -1558,8 +1595,8 @@
</path>
<path name="compress-voip-call usb-headphones">
- <ctl name="AFE_PCM_RX_Voice Mixer Voip" value="1" />
- <ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value="1" />
+ <ctl name="USB_AUDIO_RX_Voice Mixer Voip" value="1" />
+ <ctl name="Voip_Tx Mixer USB_AUDIO_TX_Voip" value="1" />
</path>
<path name="compress-voip-call voice-speaker-vbat">
@@ -1598,8 +1635,8 @@
</path>
<path name="vowlan-call usb-headphones">
- <ctl name="AFE_PCM_RX_Voice Mixer VoWLAN" value="1" />
- <ctl name="VoWLAN_Tx Mixer AFE_PCM_TX_VoWLAN" value="1" />
+ <ctl name="USB_AUDIO_RX_Voice Mixer VoWLAN" value="1" />
+ <ctl name="VoWLAN_Tx Mixer USB_AUDIO_TX_VoWLAN" value="1" />
</path>
<path name="vowlan-call voice-speaker-vbat">
@@ -1638,8 +1675,8 @@
</path>
<path name="voicemmode1-call usb-headphones">
- <ctl name="AFE_PCM_RX_Voice Mixer VoiceMMode1" value="1" />
- <ctl name="VoiceMMode1_Tx Mixer AFE_PCM_TX_MMode1" value="1" />
+ <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode1" value="1" />
+ <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" />
</path>
<path name="voicemmode1-call voice-speaker-vbat">
@@ -1678,8 +1715,8 @@
</path>
<path name="voicemmode2-call usb-headphones">
- <ctl name="AFE_PCM_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer AFE_PCM_TX_MMode2" value="1" />
+ <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
</path>
<path name="voicemmode2-call voice-speaker-vbat">