From 73b84c14622b2ee33006a06a530aa4fdd6efb4e1 Mon Sep 17 00:00:00 2001
From: Jack He <siyuanh@google.com>
Date: Fri, 2 Jun 2017 19:27:30 -0700
Subject: [PATCH] Add speaker + bt-sco combo device

* Add path entry for speaker + bt-sco combo device in mixer_path_tavil.xml
* Add backend support for such path in audio_platform_info_tavil.xml

Bug: 62541790
Bug: 19171297
Test: make, HFP regression, testplans/92112
Change-Id: I32d2fab100e50fa9a196e7dfdeda64cd5ff0061e
---
 audio_platform_info_tavil.xml |  4 +++
 mixer_paths_tavil.xml         | 50 +++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml
index c010d19..bb0fe39 100644
--- a/audio_platform_info_tavil.xml
+++ b/audio_platform_info_tavil.xml
@@ -97,6 +97,10 @@
         <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_USB" backend="usb-headphones" interface="USB_AUDIO_RX"/>
         <device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" backend="voice-tty-hco-handset" interface="QUAT_MI2S_RX"/>
         <device name="SND_DEVICE_IN_VOICE_TTY_HCO_USB_MIC" backend="usb-headset-mic" interface="USB_AUDIO_TX"/>
+        <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_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="QUAT_MI2S_RX-and-SLIMBUS_7_RX"/>
     </backend_names>
     <gain_db_to_level_mapping>
         <gain_level_map db="-8.6" level="4"/>
diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml
index 043c1bb..7f4fff7 100644
--- a/mixer_paths_tavil.xml
+++ b/mixer_paths_tavil.xml
@@ -693,6 +693,16 @@
         <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia1" value="1" />
     </path>
 
+    <path name="deep-buffer-playback speaker-and-bt-sco">
+      <path name="deep-buffer-playback speaker" />
+      <path name="deep-buffer-playback bt-sco"  />
+    </path>
+
+    <path name="deep-buffer-playback speaker-and-bt-sco-wb">
+      <path name="deep-buffer-playback speaker" />
+      <path name="deep-buffer-playback bt-sco-wb"  />
+    </path>
+
     <path name="low-latency-playback">
         <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia5" value="1" />
     </path>
@@ -753,6 +763,16 @@
         <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia5" value="1" />
     </path>
 
+    <path name="low-latency-playback speaker-and-bt-sco">
+      <path name="low-latency-playback speaker" />
+      <path name="low-latency-playback bt-sco"  />
+    </path>
+
+    <path name="low-latency-playback speaker-and-bt-sco-wb">
+      <path name="low-latency-playback speaker" />
+      <path name="low-latency-playback bt-sco-wb"  />
+    </path>
+
     <path name="audio-ull-playback">
         <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia8" value="1" />
     </path>
@@ -813,6 +833,16 @@
         <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia8" value="1" />
     </path>
 
+    <path name="audio-ull-playback speaker-and-bt-sco">
+      <path name="audio-ull-playback speaker" />
+      <path name="audio-ull-playback bt-sco"  />
+    </path>
+
+    <path name="audio-ull-playback speaker-and-bt-sco-wb">
+      <path name="audio-ull-playback speaker" />
+      <path name="audio-ull-playback bt-sco-wb"  />
+    </path>
+
     <path name="hifi-playback display-port">
         <ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" />
     </path>
@@ -893,6 +923,16 @@
         <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia4" value="1" />
     </path>
 
+    <path name="compress-offload-playback speaker-and-bt-sco">
+      <path name="compress-offload-playback speaker" />
+      <path name="compress-offload-playback bt-sco"  />
+    </path>
+
+    <path name="compress-offload-playback speaker-and-bt-sco-wb">
+      <path name="compress-offload-playback speaker" />
+      <path name="compress-offload-playback bt-sco-wb"  />
+    </path>
+
     <path name="mmap-playback">
         <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="1" />
     </path>
@@ -919,6 +959,16 @@
         <ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="1" />
     </path>
 
+    <path name="mmap-playback speaker-and-bt-sco">
+      <path name="mmap-playback speaker" />
+      <path name="mmap-playback bt-sco"  />
+    </path>
+
+    <path name="mmap-playback speaker-and-bt-sco-wb">
+      <path name="mmap-playback speaker" />
+      <path name="mmap-playback bt-sco-wb"  />
+    </path>
+
     <path name="audio-record">
         <ctl name="MultiMedia1 Mixer SLIM_0_TX" value="1" />
     </path>