audio: add missing path for hifi playback & record
missing path for usb headset record + voice call concurrency usecase
for example:
1. usb headset recording
2. make a voice call
3. switch to speaker mode
4. unable to find path 'hifi-record'
Bug: 70194145
Change-Id: Ia5e11602dd5f9b98b91c6bf887c3a06252c591cd
Signed-off-by: David Lin <dtwlin@google.com>
diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml
index 5ba1e00..406efe9 100644
--- a/mixer_paths_tavil.xml
+++ b/mixer_paths_tavil.xml
@@ -83,8 +83,10 @@
<ctl name="SLIMBUS_3_RX Port Mixer MI2S_TX" value="0" />
<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 MultiMedia2" value="0" />
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="0" />
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia5" value="0" />
+ <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia6" value="0" />
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia7" value="0" />
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="0" />
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia11" value="0" />
@@ -116,6 +118,9 @@
<ctl name="MultiMedia1 Mixer SLIM_0_TX" value="0" />
<ctl name="MultiMedia1 Mixer SLIM_4_TX" value="0" />
<ctl name="MultiMedia1 Mixer SLIM_7_TX" value="0" />
+ <ctl name="MultiMedia2 Mixer SLIM_0_TX" value="0" />
+ <ctl name="MultiMedia2 Mixer SLIM_7_TX" value="0" />
+ <ctl name="MultiMedia10 Mixer SLIM_7_TX" value="0" />
<ctl name="HDMI Mixer MultiMedia1" value="0" />
<ctl name="HDMI Mixer MultiMedia2" value="0" />
<ctl name="HDMI Mixer MultiMedia3" value="0" />
@@ -198,6 +203,7 @@
<ctl name="MultiMedia3 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="MultiMedia10 Mixer USB_AUDIO_TX" value="0" />
<ctl name="USB_AUDIO_RX Channels" value="Two" />
<ctl name="USB_AUDIO_RX SampleRate" value="KHZ_48" />
<ctl name="USB_AUDIO_RX Format" value="S16_LE" />
@@ -205,7 +211,9 @@
<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="MultiMedia10 Mixer SLIM_0_TX" value="0" />
<ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia1" value="0" />
+ <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia2" value="0" />
<ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia3" value="0" />
<ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia4" value="0" />
<ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia5" value="0" />
@@ -513,12 +521,6 @@
<ctl name="VoWLAN_Tx Mixer USB_AUDIO_TX_VoWLAN" value="0" />
<!-- VoWLAN end-->
- <!-- Audio BTSCO -->
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia5" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia6" value="0" />
- <ctl name="MultiMedia1 Mixer SLIM_7_TX" value="0" />
<!-- IIR/voice anc -->
<ctl name="IIR0 Band1" id ="0" value="268435456" />
<ctl name="IIR0 Band1" id ="1" value="0" />
@@ -865,10 +867,31 @@
<path name="audio-ull-playback bt-sco-wb" />
</path>
+ <path name="hifi-playback">
+ <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia2" value="1" />
+ </path>
+
+ <path name="hifi-playback speaker">
+ <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia2" value="1" />
+ </path>
+
+ <path name="hifi-playback handset">
+ <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia2" value="1" />
+ </path>
+
<path name="hifi-playback display-port">
<ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" />
</path>
+ <path name="hifi-playback bt-sco">
+ <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia2" value="1" />
+ </path>
+
+ <path name="hifi-playback bt-sco-wb">
+ <ctl name="BT SampleRate" value="KHZ_16" />
+ <path name="hifi-playback bt-sco" />
+ </path>
+
<path name="hifi-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" />
</path>
@@ -881,10 +904,23 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia2" value="1" />
</path>
+ <path name="hifi-record">
+ <ctl name="MultiMedia2 Mixer SLIM_0_TX" value="1" />
+ </path>
+
<path name="hifi-record usb-headset-mic">
<ctl name="MultiMedia2 Mixer USB_AUDIO_TX" value="1" />
</path>
+ <path name="hifi-record bt-sco">
+ <ctl name="MultiMedia2 Mixer SLIM_7_TX" value="1" />
+ </path>
+
+ <path name="hifi-record bt-sco-wb">
+ <ctl name="BT SampleRate" value="KHZ_16" />
+ <path name="hifi-record bt-sco" />
+ </path>
+
<path name="compress-offload-playback">
<ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia4" value="1" />
</path>
