From e2a96f3eb2f5eb57e45f509d66b3aa7253a288d7 Mon Sep 17 00:00:00 2001
From: vincenttew <vincenttew@google.com>
Date: Wed, 30 Aug 2023 12:00:50 +0800
Subject: [PATCH] factory: correct usb mfg playback/capture config

Bug: 297765839
Change-Id: If66c371277440ec0f0319dedc0875df7d39c9bbc
Signed-off-by: vincenttew <vincenttew@google.com>
---
 audio/akita/config/mixer_paths_factory.xml    | 12 ++++++++++++
 audio/akita/config/mixer_paths_factory_ti.xml | 15 +++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/audio/akita/config/mixer_paths_factory.xml b/audio/akita/config/mixer_paths_factory.xml
index 37171fc..84b468a 100644
--- a/audio/akita/config/mixer_paths_factory.xml
+++ b/audio/akita/config/mixer_paths_factory.xml
@@ -21,6 +21,10 @@
     <ctl name="US Record Enable" value="0" />
     <ctl name="ASPRX1 Slot Position" value="0"/>
     <ctl name="R ASPRX1 Slot Position" value="1"/>
+    <ctl name="USB Card" value="1"/>
+    <ctl name="USB Device" value="0"/>
+    <ctl name="USB Direction" value="0" />
+    <ctl name="USB Memory Config" value="0" />
 
     <path name="mfg-playback">
     </path>
@@ -46,6 +50,10 @@
         <ctl name="USB Capture EP ID v2" value="1" />
         <ctl name="USB Capture FORMAT v2" value="1" />
         <ctl name="USB Config To AoC v2" value="1"/>
+        <ctl name="USB Card" value="1"/>
+        <ctl name="USB Device" value="0"/>
+        <ctl name="USB Direction" value="1" />
+        <ctl name="USB Memory Config" value="1" />
         <ctl name="EP1 TX Mixer USB_TX" value="1"/>
     </path>
 
@@ -273,6 +281,10 @@
         <ctl name="USB Playback CH v2" value="2" />
         <ctl name="USB Playback BW v2" value="16" />
         <ctl name="USB Config To AoC v2" value="1" />
+        <ctl name="USB Card" value="1"/>
+        <ctl name="USB Device" value="0"/>
+        <ctl name="USB Direction" value="0" />
+        <ctl name="USB Memory Config" value="1" />
         <ctl name="USB_RX Mixer EP3" value="1" />
     </path>
 
diff --git a/audio/akita/config/mixer_paths_factory_ti.xml b/audio/akita/config/mixer_paths_factory_ti.xml
index 375731e..1a2fda3 100644
--- a/audio/akita/config/mixer_paths_factory_ti.xml
+++ b/audio/akita/config/mixer_paths_factory_ti.xml
@@ -19,6 +19,10 @@
 
     <ctl name="TDM_0_RX Mixer US" value="0" />
     <ctl name="US Record Enable" value="0" />
+    <ctl name="USB Card" value="1"/>
+    <ctl name="USB Device" value="0"/>
+    <ctl name="USB Direction" value="0" />
+    <ctl name="USB Memory Config" value="0" />
 
     <path name="mfg-playback">
     </path>
@@ -40,8 +44,14 @@
 
     <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 EP ID v2" value="1" />
         <ctl name="USB Capture FORMAT v2" value="1" />
         <ctl name="USB Config To AoC v2" value="1"/>
+        <ctl name="USB Card" value="1"/>
+        <ctl name="USB Device" value="0"/>
+        <ctl name="USB Direction" value="1" />
+        <ctl name="USB Memory Config" value="1" />
         <ctl name="EP1 TX Mixer USB_TX" value="1"/>
     </path>
 
@@ -244,11 +254,16 @@
     <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" />
         <ctl name="USB Playback BW v2" value="16" />
         <ctl name="USB Config To AoC v2" value="1" />
+        <ctl name="USB Card" value="1"/>
+        <ctl name="USB Device" value="0"/>
+        <ctl name="USB Direction" value="0" />
+        <ctl name="USB Memory Config" value="1" />
         <ctl name="USB_RX Mixer EP3" value="1" />
     </path>