From 5f962c00c020c3653a3d7750f4514f37701fef4e Mon Sep 17 00:00:00 2001
From: vincenttew <vincenttew@google.com>
Date: Thu, 15 Dec 2022 16:57:23 +0800
Subject: [PATCH] fix usb factory loopback/playback/capture fail

Test: factory command, normal playback/capture
Bug: 245503800
Change-Id: I5f9aa710725f6e9869e7632f0c268e9e67f925c5
Signed-off-by: vincenttew <vincenttew@google.com>
---
 audio/husky/config/mixer_paths.xml              | 2 +-
 audio/husky/config/mixer_paths_factory.xml      | 2 ++
 audio/ripcurrent/config/mixer_paths.xml         | 2 +-
 audio/ripcurrent/config/mixer_paths_factory.xml | 2 ++
 audio/shiba/config/mixer_paths.xml              | 2 +-
 audio/shiba/config/mixer_paths_factory.xml      | 2 ++
 6 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/audio/husky/config/mixer_paths.xml b/audio/husky/config/mixer_paths.xml
index 89ef6bd..43fe9b4 100644
--- a/audio/husky/config/mixer_paths.xml
+++ b/audio/husky/config/mixer_paths.xml
@@ -240,7 +240,7 @@
     <ctl name="MIC Record Soft Gain (dB)" value="-40"/>
 
     <!-- USB setting v2 -->
-    <ctl name="USB Bus ID v2" value="2"/>
+    <ctl name="USB Bus ID v2" value="1"/>
     <ctl name="USB Dev ID v2" value="2"/>
     <ctl name="USB Playback EP ID v2" value="1"/>
     <ctl name="USB Playback FORMAT v2" value="0"/>
diff --git a/audio/husky/config/mixer_paths_factory.xml b/audio/husky/config/mixer_paths_factory.xml
index 8e99261..16e0c3e 100644
--- a/audio/husky/config/mixer_paths_factory.xml
+++ b/audio/husky/config/mixer_paths_factory.xml
@@ -42,6 +42,7 @@
 
     <path name="mfg-record usb-headset-mic">
         <ctl name="Audio Capture Mic Source" value="USB_MIC"/>
+        <ctl name="USB Playback EP ID v2" value="0" />
         <ctl name="USB Capture FORMAT v2" value="1" />
         <ctl name="USB Config To AoC v2" value="1"/>
         <ctl name="EP1 TX Mixer USB_TX" value="1"/>
@@ -296,6 +297,7 @@
     <path name="mfg-playback usb-headphones">
         <ctl name="USB Dev ID v2" value="2" />
         <ctl name="USB Playback EP ID v2" value="1" />
+        <ctl name="USB Capture EP ID v2" value="0" />
         <ctl name="USB Playback FORMAT v2" value="6" />
         <ctl name="USB Playback SR v2" value="48000" />
         <ctl name="USB Playback CH v2" value="2" />
diff --git a/audio/ripcurrent/config/mixer_paths.xml b/audio/ripcurrent/config/mixer_paths.xml
index 986943e..013eafa 100644
--- a/audio/ripcurrent/config/mixer_paths.xml
+++ b/audio/ripcurrent/config/mixer_paths.xml
@@ -248,7 +248,7 @@
     <ctl name="MIC Record Soft Gain (dB)" value="-40"/>
 
     <!-- USB setting v2 -->
-    <ctl name="USB Bus ID v2" value="2"/>
+    <ctl name="USB Bus ID v2" value="1"/>
     <ctl name="USB Dev ID v2" value="2"/>
     <ctl name="USB Playback EP ID v2" value="1"/>
     <ctl name="USB Playback FORMAT v2" value="0"/>
diff --git a/audio/ripcurrent/config/mixer_paths_factory.xml b/audio/ripcurrent/config/mixer_paths_factory.xml
index 76f9d45..2f3f324 100644
--- a/audio/ripcurrent/config/mixer_paths_factory.xml
+++ b/audio/ripcurrent/config/mixer_paths_factory.xml
@@ -44,6 +44,7 @@
 
     <path name="mfg-record usb-headset-mic">
         <ctl name="Audio Capture Mic Source" value="USB_MIC"/>
+        <ctl name="USB Playback EP ID v2" value="0" />
         <ctl name="USB Capture FORMAT v2" value="1" />
         <ctl name="USB Config To AoC v2" value="1"/>
         <ctl name="EP1 TX Mixer USB_TX" value="1"/>
@@ -422,6 +423,7 @@
     <path name="mfg-playback usb-headphones">
         <ctl name="USB Dev ID v2" value="2" />
         <ctl name="USB Playback EP ID v2" value="1" />
+        <ctl name="USB Capture EP ID v2" value="0" />
         <ctl name="USB Playback FORMAT v2" value="6" />
         <ctl name="USB Playback SR v2" value="48000" />
         <ctl name="USB Playback CH v2" value="2" />
diff --git a/audio/shiba/config/mixer_paths.xml b/audio/shiba/config/mixer_paths.xml
index 89ef6bd..43fe9b4 100644
--- a/audio/shiba/config/mixer_paths.xml
+++ b/audio/shiba/config/mixer_paths.xml
@@ -240,7 +240,7 @@
     <ctl name="MIC Record Soft Gain (dB)" value="-40"/>
 
     <!-- USB setting v2 -->
-    <ctl name="USB Bus ID v2" value="2"/>
+    <ctl name="USB Bus ID v2" value="1"/>
     <ctl name="USB Dev ID v2" value="2"/>
     <ctl name="USB Playback EP ID v2" value="1"/>
     <ctl name="USB Playback FORMAT v2" value="0"/>
diff --git a/audio/shiba/config/mixer_paths_factory.xml b/audio/shiba/config/mixer_paths_factory.xml
index 8e99261..16e0c3e 100644
--- a/audio/shiba/config/mixer_paths_factory.xml
+++ b/audio/shiba/config/mixer_paths_factory.xml
@@ -42,6 +42,7 @@
 
     <path name="mfg-record usb-headset-mic">
         <ctl name="Audio Capture Mic Source" value="USB_MIC"/>
+        <ctl name="USB Playback EP ID v2" value="0" />
         <ctl name="USB Capture FORMAT v2" value="1" />
         <ctl name="USB Config To AoC v2" value="1"/>
         <ctl name="EP1 TX Mixer USB_TX" value="1"/>
@@ -296,6 +297,7 @@
     <path name="mfg-playback usb-headphones">
         <ctl name="USB Dev ID v2" value="2" />
         <ctl name="USB Playback EP ID v2" value="1" />
+        <ctl name="USB Capture EP ID v2" value="0" />
         <ctl name="USB Playback FORMAT v2" value="6" />
         <ctl name="USB Playback SR v2" value="48000" />
         <ctl name="USB Playback CH v2" value="2" />