Evolution-X-Tensor/device_google_comet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "audio: enable 96k playback" into udc-qpr-dev am: fc5875a421 am: 48748a7bed

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/comet/+/24379619

Change-Id: Ie619c616f505a38ea9ae3172c6503422399349c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Robert Lee 2023-08-22 08:21:29 +00:00 • committed by Automerger Merge Worker
commit 76a1c24154
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
audio/comet/config/mixer_paths.xml
View file

@ -36,10 +36,10 @@
<!-- TDM 0 setting --> <!-- TDM 0 setting -->
<ctl name="TDM_0_RX Chan" value="Four"/> <ctl name="TDM_0_RX Chan" value="Four"/>
<ctl name="TDM_0_RX Format" value="S32_LE"/> <ctl name="TDM_0_RX Format" value="S32_LE"/>
<ctl name="TDM_0_RX Sample Rate" value="SR_48K" /> <ctl name="TDM_0_RX Sample Rate" value="SR_96K" />
<ctl name="TDM_0_TX Chan" value="Four"/> <ctl name="TDM_0_TX Chan" value="Four"/>
<ctl name="TDM_0_TX Format" value="S32_LE"/> <ctl name="TDM_0_TX Format" value="S32_LE"/>
<ctl name="TDM_0_TX Sample Rate" value="SR_48K" /> <ctl name="TDM_0_TX Sample Rate" value="SR_96K" />
<!-- Haptic setting --> <!-- Haptic setting -->
<ctl name="Haptics Source" value="PCM"/> <ctl name="Haptics Source" value="PCM"/>
@ -47,12 +47,12 @@
<ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/> <ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/>
<ctl name="HAPTIC_RX Chan" value="Four"/> <ctl name="HAPTIC_RX Chan" value="Four"/>
<ctl name="HAPTIC_RX nSlot" value="Four"/> <ctl name="HAPTIC_RX nSlot" value="Four"/>
<ctl name="RX Slots" id="0" value="2"/> <ctl name="RX Slots" id="0" value="3"/>
<ctl name="RX Slots" id="1" value="3"/> <ctl name="RX Slots" id="1" value="3"/>
<!-- Cirrus default 96K --> <!-- Cirrus default 96K -->
<ctl name="Default 96K" value="0"/> <ctl name="Default 96K" value="1"/>
<ctl name="R Default 96K" value="0"/> <ctl name="R Default 96K" value="1"/>
<!-- Cirrus Booster Amp TDM slot assignment--> <!-- Cirrus Booster Amp TDM slot assignment-->
<!-- RX slot --> <!-- RX slot -->

4
audio/comet/config/mixer_paths_factory.xml
View file

@ -176,12 +176,12 @@
</path> </path>
<path name="cs35l41-us-config-2"> <path name="cs35l41-us-config-2">
<ctl name="R ASPRX1 Slot Position" value="3"/> <ctl name="R ASPRX1 Slot Position" value="2"/>
</path> </path>
<path name="cs35l41-us-config-all"> <path name="cs35l41-us-config-all">
<ctl name="ASPRX1 Slot Position" value="2"/> <ctl name="ASPRX1 Slot Position" value="2"/>
<ctl name="R ASPRX1 Slot Position" value="3"/> <ctl name="R ASPRX1 Slot Position" value="2"/>
</path> </path>
<path name="amp_iv-only"> <path name="amp_iv-only">