Merge "factory: correct usb mfg playback/capture config" into udc-qpr-dev am: 17f9e8e68f

Original change: https://googleplex-android-review.googlesource.com/c/device/google/caimito/+/24519189

Change-Id: I9d58d3273d78a1bdd0e7291a3da41cf74e00b754
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-08-29 10:28:03 +00:00 committed by Automerger Merge Worker
commit 09edcf5bb4
4 changed files with 48 additions and 16 deletions

View file

@ -23,6 +23,10 @@
<ctl name="R ASPRX1 Slot Position" value="1"/>
<ctl name="HAC AMP EN" 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>
@ -38,11 +42,13 @@
<path name="mfg-record usb-headset-mic">
<ctl name="Audio Capture Mic Source" value="USB_MIC"/>
<ctl name="USB Card" value="1"/>
<ctl name="USB Device" value="0"/>
<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="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>
@ -323,8 +329,6 @@
<path name="mfg-playback usb-headphones">
<ctl name="USB Dev ID v2" value="2" />
<ctl name="USB Card" value="1"/>
<ctl name="USB Device" value="0"/>
<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" />
@ -332,6 +336,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>

View file

@ -23,6 +23,10 @@
<ctl name="R ASPRX1 Slot Position" value="1"/>
<ctl name="HAC AMP EN" 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>
@ -38,11 +42,13 @@
<path name="mfg-record usb-headset-mic">
<ctl name="Audio Capture Mic Source" value="USB_MIC"/>
<ctl name="USB Card" value="1"/>
<ctl name="USB Device" value="0"/>
<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="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>
@ -323,8 +329,6 @@
<path name="mfg-playback usb-headphones">
<ctl name="USB Dev ID v2" value="2" />
<ctl name="USB Card" value="1"/>
<ctl name="USB Device" value="0"/>
<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" />
@ -332,6 +336,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>

View file

@ -25,6 +25,10 @@
<ctl name="E ASPRX1 Slot Position" value="0"/>
<ctl name="HAC AMP EN" 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,11 +44,13 @@
<path name="mfg-record usb-headset-mic">
<ctl name="Audio Capture Mic Source" value="USB_MIC"/>
<ctl name="USB Card" value="1"/>
<ctl name="USB Device" value="0"/>
<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="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>
@ -475,8 +481,6 @@
<path name="mfg-playback usb-headphones">
<ctl name="USB Dev ID v2" value="2" />
<ctl name="USB Card" value="1"/>
<ctl name="USB Device" value="0"/>
<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" />
@ -484,6 +488,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>

View file

@ -23,6 +23,10 @@
<ctl name="R ASPRX1 Slot Position" value="1"/>
<ctl name="HAC AMP EN" 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>
@ -38,11 +42,13 @@
<path name="mfg-record usb-headset-mic">
<ctl name="Audio Capture Mic Source" value="USB_MIC"/>
<ctl name="USB Card" value="1"/>
<ctl name="USB Device" value="0"/>
<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="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>
@ -323,8 +329,6 @@
<path name="mfg-playback usb-headphones">
<ctl name="USB Dev ID v2" value="2" />
<ctl name="USB Card" value="1"/>
<ctl name="USB Device" value="0"/>
<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" />
@ -332,6 +336,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>