From 8266a80927fa30c9449aadcac6aceb6f5475234d Mon Sep 17 00:00:00 2001
From: Robert Lee <lerobert@google.com>
Date: Tue, 2 May 2023 10:52:48 +0800
Subject: [PATCH] audio: Phase in mixer_paths & audio_platfom_configuration
 tables

Change List :
1. Enable fast_switch control in mixer_paths.xml
2. Enable cca module in platform configuration

Files from the latest attachment on b/280032926

Bug: 280032926
Test: verified by ntkuo@
Change-Id: I4cc42dd8e136494ac2d56a5ded6990832554c48f
---
 .../akita/config/audio_platform_configuration.xml  |  3 ++-
 audio/akita/config/mixer_paths.xml                 | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/audio/akita/config/audio_platform_configuration.xml b/audio/akita/config/audio_platform_configuration.xml
index dee8e62..08d42a1 100644
--- a/audio/akita/config/audio_platform_configuration.xml
+++ b/audio/akita/config/audio_platform_configuration.xml
@@ -296,7 +296,8 @@
     <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_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="audio_amcs_ext.so"/>
         <module libname="audio_bluenote_aoc.so"/>
diff --git a/audio/akita/config/mixer_paths.xml b/audio/akita/config/mixer_paths.xml
index 97ee774..8e46010 100644
--- a/audio/akita/config/mixer_paths.xml
+++ b/audio/akita/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="817"/>
+        <ctl name="R Digital PCM Volume" value="817"/>
     </path>
 
     <path name="voice-speaker-post">