From f3ec3f642f41025b50ecd86cab7e01af1c6117e8 Mon Sep 17 00:00:00 2001
From: Carter Hsu <carterhsu@google.com>
Date: Fri, 17 Feb 2023 17:19:45 +0800
Subject: [PATCH] audio: Audio platform, Mixer_paths, Fortemedia table check in
 (2023/02/17) for telephony.

1. Mixer_path: Adding FIR fast switch in voice-speaker (ON) and speaker (OFF)
2. Audio_platform: Enable MCPS table for lib v622
3. MCPS: Change MCPS for lib v622

Files from the latest attachment on b/269713682

Bug: 269713682
Test: verified by rickycheng@
Change-Id: Ia3953ac6254e03df9708018c4d170a21129c6e5d
---
 .../config/audio_platform_configuration.xml     |   2 +-
 audio/shiba/config/mixer_paths.xml              |  14 ++++++++++++--
 audio/shiba/tuning/fortemedia/mcps.dat          | Bin 292 -> 292 bytes
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/audio/shiba/config/audio_platform_configuration.xml b/audio/shiba/config/audio_platform_configuration.xml
index febcf7b..3e928a7 100644
--- a/audio/shiba/config/audio_platform_configuration.xml
+++ b/audio/shiba/config/audio_platform_configuration.xml
@@ -300,7 +300,7 @@
     <external_module>
         <module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/>
         <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="audio_amcs_ext.so"/>
         <module libname="audio_bluenote_aoc.so"/>
diff --git a/audio/shiba/config/mixer_paths.xml b/audio/shiba/config/mixer_paths.xml
index 92f1f92..8845f54 100644
--- a/audio/shiba/config/mixer_paths.xml
+++ b/audio/shiba/config/mixer_paths.xml
@@ -109,10 +109,10 @@
     <ctl name="R ASP TX4 Source" value="Zero" />
 
     <!-- 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="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 -->
     <ctl name="PCM Playback Switch" value="1"/>
@@ -673,6 +673,10 @@
         <ctl name="R Boost Peak Current Limit" value="2.50A"/>
         <ctl name="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 name="speaker-post">
@@ -691,6 +695,12 @@
     <!--<ctl name="R DSP RX2 Source" value="ASPRX2"/>-->
         <ctl name="R 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 name="voice-speaker-post">
diff --git a/audio/shiba/tuning/fortemedia/mcps.dat b/audio/shiba/tuning/fortemedia/mcps.dat
index 04fc10042f748224f321473096600a6543c89b95..1c1631473eeb21412a0dfb8bf6f005254022636f 100644
GIT binary patch
literal 292
zcmY+<yA6Oa3`NoR$v9NmfW{pa5-qzj8IdUPOXVx;$Vy%JxgWKjS>HTs0$VRe>FGQ7
hVmLB(;TTTg6!)ZlUGC*@4(D(VHvs&<9gI?xffviYK<xkk

literal 292
zcmY+<Ar63G41>{j{f~n};4u><C=w*x{}zxSXs7zbC)VeEtb4yF_P6Jrfyu>Ch2$bG
g>&Q@r<SJ~|6+;!0OIWNELlu&10QkQh3{^<L16T?_X8-^I