From d346efb3b02e3974aa7820315f339ee043f7d2aa Mon Sep 17 00:00:00 2001
From: Carter Hsu <carterhsu@google.com>
Date: Fri, 8 Dec 2023 17:43:12 +0800
Subject: [PATCH] audio: update Telephony tuning

<Overall table path>
1. mixer_path.xml and audio_platform_configuration.xml => /vendor/etc
2. mcps.dat => /vendor/etc/aoc

<Change list>
1. Modify Cirrus AMP PCM Gain for HAC mode in mixer_path <path name="voice-hac">:
KM4: 11 => 10(10.5dB) / CM4: 11 => 10(10.5dB) / TK4: 11 => 9(9.5dB)
2. mcps.dat - updated value for iS910 short term solution
3. audio_platform_configuration- enable mcps table

Bug: 315275289
Test: build pass
Change-Id: I915fd62006ff14c36930aecd8836aca8b3c87f4b
Signed-off-by: Carter Hsu <carterhsu@google.com>
---
 .../config/audio_platform_configuration.xml   |   2 +-
 audio/caiman/config/mixer_paths.xml           |   2 +-
 audio/caiman/tuning/fortemedia/mcps.dat       | Bin 1692 -> 1692 bytes
 .../config/audio_platform_configuration.xml   |   2 +-
 audio/komodo/config/mixer_paths.xml           |   2 +-
 audio/komodo/tuning/fortemedia/mcps.dat       | Bin 1692 -> 1692 bytes
 .../config/audio_platform_configuration.xml   |   2 +-
 audio/tokay/config/mixer_paths.xml            |   2 +-
 audio/tokay/tuning/fortemedia/mcps.dat        | Bin 1692 -> 1692 bytes
 9 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/audio/caiman/config/audio_platform_configuration.xml b/audio/caiman/config/audio_platform_configuration.xml
index 72147783..a657f541 100644
--- a/audio/caiman/config/audio_platform_configuration.xml
+++ b/audio/caiman/config/audio_platform_configuration.xml
@@ -306,7 +306,7 @@
         <module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/>
         <module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN-SPEAKER Extensions=StereoSpatializerIndicator"/>
         <module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000 VoIPMode=Dl"/>
-        <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/>
+        <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="audio_amcs_ext.so"/>
         <module libname="audio_bluenote_aoc.so"/>
diff --git a/audio/caiman/config/mixer_paths.xml b/audio/caiman/config/mixer_paths.xml
index 4c11e5b2..d22cfec9 100644
--- a/audio/caiman/config/mixer_paths.xml
+++ b/audio/caiman/config/mixer_paths.xml
@@ -664,7 +664,7 @@
     <path name="voice-hac">
         <ctl name="Boost Peak Current Limit" value="3.50A"/>
         <ctl name="PCM Source" value="ASP"/>
-        <ctl name="AMP PCM Gain" value="11"/>
+        <ctl name="AMP PCM Gain" value="10"/>
         <ctl name="Main AMP Enable Switch" value="1"/>
         <ctl name="HAC AMP EN" value="1"/>
     </path>
diff --git a/audio/caiman/tuning/fortemedia/mcps.dat b/audio/caiman/tuning/fortemedia/mcps.dat
index 6bca2ff764717604a33596bd3a4377e30a5d5cf2..bdb0b941c56d4f1706c61027abc8880dd5bf1da1 100644
GIT binary patch
delta 12
UcmbQkJBN3|55_|qe=cSP03?b9@Bjb+

delta 12
UcmbQkJBN3|4@RAhKNqtC03n<OS^xk5

diff --git a/audio/komodo/config/audio_platform_configuration.xml b/audio/komodo/config/audio_platform_configuration.xml
index 72147783..a657f541 100644
--- a/audio/komodo/config/audio_platform_configuration.xml
+++ b/audio/komodo/config/audio_platform_configuration.xml
@@ -306,7 +306,7 @@
         <module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/>
         <module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN-SPEAKER Extensions=StereoSpatializerIndicator"/>
         <module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000 VoIPMode=Dl"/>
-        <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/>
+        <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="audio_amcs_ext.so"/>
         <module libname="audio_bluenote_aoc.so"/>
diff --git a/audio/komodo/config/mixer_paths.xml b/audio/komodo/config/mixer_paths.xml
index 4c11e5b2..d22cfec9 100644
--- a/audio/komodo/config/mixer_paths.xml
+++ b/audio/komodo/config/mixer_paths.xml
@@ -664,7 +664,7 @@
     <path name="voice-hac">
         <ctl name="Boost Peak Current Limit" value="3.50A"/>
         <ctl name="PCM Source" value="ASP"/>
-        <ctl name="AMP PCM Gain" value="11"/>
+        <ctl name="AMP PCM Gain" value="10"/>
         <ctl name="Main AMP Enable Switch" value="1"/>
         <ctl name="HAC AMP EN" value="1"/>
     </path>
diff --git a/audio/komodo/tuning/fortemedia/mcps.dat b/audio/komodo/tuning/fortemedia/mcps.dat
index 6bca2ff764717604a33596bd3a4377e30a5d5cf2..bdb0b941c56d4f1706c61027abc8880dd5bf1da1 100644
GIT binary patch
delta 12
UcmbQkJBN3|55_|qe=cSP03?b9@Bjb+

delta 12
UcmbQkJBN3|4@RAhKNqtC03n<OS^xk5

diff --git a/audio/tokay/config/audio_platform_configuration.xml b/audio/tokay/config/audio_platform_configuration.xml
index 72147783..a657f541 100644
--- a/audio/tokay/config/audio_platform_configuration.xml
+++ b/audio/tokay/config/audio_platform_configuration.xml
@@ -306,7 +306,7 @@
         <module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/>
         <module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN-SPEAKER Extensions=StereoSpatializerIndicator"/>
         <module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000 VoIPMode=Dl"/>
-        <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/>
+        <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="audio_amcs_ext.so"/>
         <module libname="audio_bluenote_aoc.so"/>
diff --git a/audio/tokay/config/mixer_paths.xml b/audio/tokay/config/mixer_paths.xml
index bb5ceb6a..4c91128e 100644
--- a/audio/tokay/config/mixer_paths.xml
+++ b/audio/tokay/config/mixer_paths.xml
@@ -664,7 +664,7 @@
     <path name="voice-hac">
         <ctl name="Boost Peak Current Limit" value="3.50A"/>
         <ctl name="PCM Source" value="ASP"/>
-        <ctl name="AMP PCM Gain" value="11"/>
+        <ctl name="AMP PCM Gain" value="9"/>
         <ctl name="Main AMP Enable Switch" value="1"/>
     </path>
 
diff --git a/audio/tokay/tuning/fortemedia/mcps.dat b/audio/tokay/tuning/fortemedia/mcps.dat
index 6bca2ff764717604a33596bd3a4377e30a5d5cf2..bdb0b941c56d4f1706c61027abc8880dd5bf1da1 100644
GIT binary patch
delta 12
UcmbQkJBN3|55_|qe=cSP03?b9@Bjb+

delta 12
UcmbQkJBN3|4@RAhKNqtC03n<OS^xk5