commit e76a6ff6f20a53681da7d43dbae1f2f22d8c83ae
author juyuchen <juyuchen@google.com> Tue May 22 17:35:57 2018 +0800
committer juyuchen <juyuchen@google.com> Tue May 22 17:35:57 2018 +0800
tree 7d05ccff45b3e34c86b57eb4446e51162d8d1cda
parent 62a9ac6097fb3886f22948a8d8e933651010e664

audio: update table : add bt-sco and speaker-safe path

Bug: 78257659
Test: manual audio test on M2

Change-Id: If17a4a0451891185fd7e6a073b9cc29c0ea6a7a5
Signed-off-by: juyuchen <juyuchen@google.com>

audio_platform_info_tavil.xml

diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml
index 91b2dd1..846e305 100644
--- a/audio_platform_info_tavil.xml
+++ b/audio_platform_info_tavil.xml
@@ -86,7 +86,9 @@
         <device name="SND_DEVICE_OUT_BT_SCO" backend="bt-sco" interface="SLIMBUS_7_RX"/>
         <device name="SND_DEVICE_OUT_BT_SCO_WB" backend="bt-sco-wb" interface="SLIMBUS_7_RX"/>
         <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO" backend="speaker-and-bt-sco" interface="QUAT_MI2S_RX-and-SLIMBUS_7_RX"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO" backend="speaker-and-bt-sco" interface="QUAT_MI2S_RX-and-SLIMBUS_7_RX"/>
         <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="QUAT_MI2S_RX-and-SLIMBUS_7_RX"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="QUAT_MI2S_RX-and-SLIMBUS_7_RX"/>
         <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_USB" backend="usb-headset" interface="USB_AUDIO_RX"/>
         <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_USB" backend="voice-tty-vco-usb" interface="USB_AUDIO_RX"/>
         <device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" backend="voice-tty-hco-handset" interface="QUAT_MI2S_RX"/>

mixer_paths_tavil.xml

diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml
index 920552c..46c5a68 100644
--- a/mixer_paths_tavil.xml
+++ b/mixer_paths_tavil.xml
@@ -1861,6 +1861,26 @@
         <path name="handset-mic" />
     </path>
 
+    <path name="speaker-and-bt-sco">
+        <path name="speaker"/>
+        <path name="bt-sco-headset"/>
+    </path>
+
+    <path name="speaker-and-bt-sco-wb">
+        <path name="speaker"/>
+        <path name="bt-sco-headset-wb"/>
+    </path>
+
+    <path name="speaker-safe-and-bt-sco">
+        <path name="speaker-safe"/>
+        <path name="bt-sco-headset"/>
+    </path>
+
+    <path name="speaker-safe-and-bt-sco-wb">
+        <path name="speaker-safe"/>
+        <path name="bt-sco-headset-wb"/>
+    </path>
+
     <path name="bt-sco-headset">
     </path>