Merge "audio: Audio platform, Mixer_paths, Fortemedia table check in (2023/02/17) for telephony." into udc-dev

This commit is contained in:
Carter Hsu 2023-02-21 02:36:54 +00:00 committed by Android (Google) Code Review
commit 6aa5ce6f08
3 changed files with 13 additions and 3 deletions

View file

@ -300,7 +300,7 @@
<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_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000"/>
<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="801"/>
<ctl name="R Digital PCM Volume" value="801"/>
</path> </path>
<path name="voice-speaker-post"> <path name="voice-speaker-post">