Merge "audio: Phase in mixer_paths & audio_platfom_configuration tables" into udc-d1-dev am: 2dbe894e7f

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

Change-Id: I630c5e65a013d8f7230088a926b0182eb8de280f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-05-03 11:38:03 +00:00 committed by Automerger Merge Worker
commit 52eba70946
2 changed files with 14 additions and 3 deletions

View file

@ -296,7 +296,8 @@
<external_module> <external_module>
<module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/> <module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/>
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/> <module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
<module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000"/> <module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000"/>
<module libname="audio_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/>
<module libname="liboffloadeffect.so"/> <module libname="liboffloadeffect.so"/>
<module libname="audio_amcs_ext.so"/> <module libname="audio_amcs_ext.so"/>
<module libname="audio_bluenote_aoc.so"/> <module libname="audio_bluenote_aoc.so"/>

View file

@ -109,10 +109,10 @@
<ctl name="R ASP TX4 Source" value="Zero" /> <ctl name="R ASP TX4 Source" value="Zero" />
<!-- Cirrus fast switch init --> <!-- Cirrus fast switch init -->
<!--ctl name="Fast Use Case Switch Enable" value="0" /> <ctl name="Fast Use Case Switch Enable" value="0" />
<ctl name="Fast Use Case Delta File" value="fast_switch5.txt" /> <ctl name="Fast Use Case Delta File" value="fast_switch5.txt" />
<ctl name="R Fast Use Case Switch Enable" value="0" /> <ctl name="R Fast Use Case Switch Enable" value="0" />
<ctl name="R Fast Use Case Delta File" value="fast_switch5.txt" /--> <ctl name="R Fast Use Case Delta File" value="fast_switch5.txt" />
<!-- default EP volume --> <!-- default EP volume -->
<ctl name="PCM Playback Switch" value="1"/> <ctl name="PCM Playback Switch" value="1"/>
@ -673,6 +673,10 @@
<ctl name="R Boost Peak Current Limit" value="2.50A"/> <ctl name="R Boost Peak Current Limit" value="2.50A"/>
<ctl name="Main AMP Enable Switch" value="1"/> <ctl name="Main AMP Enable Switch" value="1"/>
<ctl name="R Main AMP Enable Switch" value="1"/> <ctl name="R Main AMP Enable Switch" value="1"/>
<ctl name="Fast Use Case Delta File" value="fast_switch3.txt" />
<ctl name="Fast Use Case Switch Enable" value="1" />
<ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" />
</path> </path>
<path name="speaker-post"> <path name="speaker-post">
@ -691,6 +695,12 @@
<!--<ctl name="R DSP RX2 Source" value="ASPRX2"/>--> <!--<ctl name="R DSP RX2 Source" value="ASPRX2"/>-->
<ctl name="R Main AMP Enable Switch" value="1"/> <ctl name="R Main AMP Enable Switch" value="1"/>
<ctl name="Main AMP Enable Switch" value="1"/> <ctl name="Main AMP Enable Switch" value="1"/>
<ctl name="Fast Use Case Delta File" value="fast_switch1.txt" />
<ctl name="Fast Use Case Switch Enable" value="1" />
<ctl name="R Fast Use Case Delta File" value="fast_switch2.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" />
<ctl name="Digital PCM Volume" value="817"/>
<ctl name="R Digital PCM Volume" value="817"/>
</path> </path>
<path name="voice-speaker-post"> <path name="voice-speaker-post">