From 6def5fe520ca576f71a2e140fcfe19f85540e9df Mon Sep 17 00:00:00 2001
From: Joey Poomarin Phloyphisut <poomarin@google.com>
Date: Thu, 8 Jul 2021 03:58:53 +0000
Subject: [PATCH] USB Audio: Add USB HiFi routing

Let USB HiFi BE as a standalone bind/src command to AoC.
And fix that USB HiFi Rx no audio after the other touch
sound's UC and BE is closed.

On top of the change of pa/1959717
(pa/Ib82ff06986ebe97d472f4518aa136f32da30da66)

Test: Local test
Bug: 191222376
Change-Id: I1017aab232bd2e929dc4caa9939f0613ba937f86
---
 audio/oriole/config/mixer_paths.xml   | 5 +++--
 audio/raven/config/mixer_paths.xml    | 5 +++--
 audio/slider/config/mixer_paths.xml   | 5 +++--
 audio/whitefin/config/mixer_paths.xml | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml
index 0c9ddd9..e0702a5 100644
--- a/audio/oriole/config/mixer_paths.xml
+++ b/audio/oriole/config/mixer_paths.xml
@@ -132,6 +132,7 @@
     <ctl name="USB_RX Mixer EP7" value="0"/>
     <ctl name="USB_RX Mixer NoHost1" value="0"/>
     <ctl name="USB_RX Mixer VOIP" value="0"/>
+    <ctl name="USB_RX Mixer HIFI" value="0"/>
 
     <ctl name="BT_RX Mixer EP1" value="0"/>
     <ctl name="BT_RX Mixer EP2" value="0"/>
@@ -512,13 +513,13 @@
 
     <path name="hifi-playbackP usb-headphone">
         <ctl name="PCM Playback Volume" value="1000"/>
+        <ctl name="USB_RX Mixer HIFI" value="1"/>
     </path>
 
     <path name="hifi-recordC">
     </path>
 
-    <path name="hifi-recordC usb-headphone">
-        <ctl name="PCM Playback Volume" value="1000"/>
+    <path name="hifi-recordC usb-headset-mic">
     </path>
 
     <!-- audio capture dynamic route -->
diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml
index 0c9ddd9..e0702a5 100644
--- a/audio/raven/config/mixer_paths.xml
+++ b/audio/raven/config/mixer_paths.xml
@@ -132,6 +132,7 @@
     <ctl name="USB_RX Mixer EP7" value="0"/>
     <ctl name="USB_RX Mixer NoHost1" value="0"/>
     <ctl name="USB_RX Mixer VOIP" value="0"/>
+    <ctl name="USB_RX Mixer HIFI" value="0"/>
 
     <ctl name="BT_RX Mixer EP1" value="0"/>
     <ctl name="BT_RX Mixer EP2" value="0"/>
@@ -512,13 +513,13 @@
 
     <path name="hifi-playbackP usb-headphone">
         <ctl name="PCM Playback Volume" value="1000"/>
+        <ctl name="USB_RX Mixer HIFI" value="1"/>
     </path>
 
     <path name="hifi-recordC">
     </path>
 
-    <path name="hifi-recordC usb-headphone">
-        <ctl name="PCM Playback Volume" value="1000"/>
+    <path name="hifi-recordC usb-headset-mic">
     </path>
 
     <!-- audio capture dynamic route -->
diff --git a/audio/slider/config/mixer_paths.xml b/audio/slider/config/mixer_paths.xml
index 5b13e09..781c43b 100644
--- a/audio/slider/config/mixer_paths.xml
+++ b/audio/slider/config/mixer_paths.xml
@@ -109,6 +109,7 @@
     <ctl name="USB_RX Mixer EP7" value="0"/>
     <ctl name="USB_RX Mixer NoHost1" value="0"/>
     <ctl name="USB_RX Mixer VOIP" value="0"/>
+    <ctl name="USB_RX Mixer HIFI" value="0"/>
 
     <ctl name="BT_RX Mixer EP1" value="0"/>
     <ctl name="BT_RX Mixer EP2" value="0"/>
@@ -467,13 +468,13 @@
 
     <path name="hifi-playbackP usb-headphone">
         <ctl name="PCM Playback Volume" value="1000"/>
+        <ctl name="USB_RX Mixer HIFI" value="1"/>
     </path>
 
     <path name="hifi-recordC">
     </path>
 
-    <path name="hifi-recordC usb-headphone">
-        <ctl name="PCM Playback Volume" value="1000"/>
+    <path name="hifi-recordC usb-headset-mic">
     </path>
 
     <!-- audio capture dynamic route -->
diff --git a/audio/whitefin/config/mixer_paths.xml b/audio/whitefin/config/mixer_paths.xml
index 7b5f7a9..fc1ff70 100644
--- a/audio/whitefin/config/mixer_paths.xml
+++ b/audio/whitefin/config/mixer_paths.xml
@@ -123,6 +123,7 @@
     <ctl name="USB_RX Mixer EP7" value="0"/>
     <ctl name="USB_RX Mixer NoHost1" value="0"/>
     <ctl name="USB_RX Mixer VOIP" value="0"/>
+    <ctl name="USB_RX Mixer HIFI" value="0"/>
 
     <ctl name="BT_RX Mixer EP1" value="0"/>
     <ctl name="BT_RX Mixer EP2" value="0"/>
@@ -543,13 +544,13 @@
 
     <path name="hifi-playbackP usb-headphone">
         <ctl name="PCM Playback Volume" value="1000"/>
+        <ctl name="USB_RX Mixer HIFI" value="1"/>
     </path>
 
     <path name="hifi-recordC">
     </path>
 
-    <path name="hifi-recordC usb-headphone">
-        <ctl name="PCM Playback Volume" value="1000"/>
+    <path name="hifi-recordC usb-headset-mic">
     </path>
 
     <!-- audio capture dynamic route -->