From c3e70c164be825a6b2d2b7d06813024f08a5ba0c Mon Sep 17 00:00:00 2001
From: Carter Hsu <carterhsu@google.com>
Date: Thu, 6 Jan 2022 03:43:00 +0000
Subject: [PATCH] Revert "Revert "audio: enable SA lite/full module""

This reverts commit 1fa392b4b2a4ad8b11e93a68db09b87c8438fffe.

Reason for revert: <AoC enables the SA module>

Change-Id: I4aaf967432b0254e3369608fa5a95cb2bd87079b
---
 .../config/audio_platform_configuration.xml    |  5 ++++-
 audio/cheetah/config/mixer_paths.xml           |  6 ++++--
 .../config/audio_platform_configuration.xml    | 18 +++++++++---------
 audio/cloudripper/config/mixer_paths.xml       |  6 ++++--
 .../config/audio_platform_configuration.xml    |  5 ++++-
 audio/panther/config/mixer_paths.xml           |  6 ++++--
 .../config/audio_platform_configuration.xml    |  2 +-
 audio/ravenclaw/config/mixer_paths.xml         |  6 ++++--
 8 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/audio/cheetah/config/audio_platform_configuration.xml b/audio/cheetah/config/audio_platform_configuration.xml
index e541d18..c3ebb6f 100644
--- a/audio/cheetah/config/audio_platform_configuration.xml
+++ b/audio/cheetah/config/audio_platform_configuration.xml
@@ -34,7 +34,7 @@
         <!--intf id="BE_HW_RX_INTF_3" name="BT_RX"/-->
         <intf id="BE_VIRTUAL_VOICE_RX_TUNING" block_id="19"/>
         <intf id="BE_VIRTUAL_VOICE_TX_TUNING" block_id="19"/>
-        <intf id="BE_HW_TX_INTF_0" block_id="134,128"/>
+        <intf id="BE_HW_TX_INTF_0" block_id="134,128,137"/>
     </hw_intf>
 
     <product_lists>
@@ -247,6 +247,9 @@
         <cfg id="IN_USB_TTY_VCO_MIC_BE_CFG" be_path="NULL" codec_path="voice-speaker-mic"/>
         <cfg id="IN_USB_TTY_HCO_MIC_BE_CFG" be_path="usb-headset-mic" codec_path="usb-headset-mic" mux="HW_MUX_GP_0"/>
         <cfg id="IN_SPK_VI_BE_CFG" codec_path="NULL" be_path="spk-vi"/>
+        <cfg id="IN_HANDSET_MIC_BE_CFG" tuning_id="62"/>
+        <cfg id="IN_HANDSET_DUAL_MIC_BE_CFG" tuning_id="63"/>
+        <cfg id="IN_HANDSET_TRIPLE_MIC_BE_CFG" tuning_id="64"/>
         <cfg id="IN_CAMCORDER_LANDSCAPE_BE_CFG" tuning_id="70"/>
         <cfg id="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG" tuning_id="71"/>
         <cfg id="IN_CAMCORDER_PORTRAIT_BE_CFG" tuning_id="72"/>
diff --git a/audio/cheetah/config/mixer_paths.xml b/audio/cheetah/config/mixer_paths.xml
index 0235f46..00e252f 100644
--- a/audio/cheetah/config/mixer_paths.xml
+++ b/audio/cheetah/config/mixer_paths.xml
@@ -649,6 +649,7 @@
 
     <!-- Tx device -->
     <path name="handset-mic">
+        <ctl name="Mic Spatial Module Enable" value="1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
@@ -674,6 +675,7 @@
     </path>
 
     <path name="speaker-mic">
+        <ctl name="Mic Spatial Module Enable" value="1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
@@ -699,7 +701,7 @@
     </path>
 
     <path name="camcorder-mic">
-        <!--ctl name="Mic Spatial Module Enable" value="1"/-->
+        <ctl name="Mic Spatial Module Enable" value="1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
@@ -708,7 +710,7 @@
     </path>
 
     <path name="camcorder-mic-post">
-        <ctl name="MIC Record Soft Gain (dB)" value="22"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="0"/>
     </path>
 
     <path name="voice-recog-mic">
diff --git a/audio/cloudripper/config/audio_platform_configuration.xml b/audio/cloudripper/config/audio_platform_configuration.xml
index 5d24246..0356bb9 100644
--- a/audio/cloudripper/config/audio_platform_configuration.xml
+++ b/audio/cloudripper/config/audio_platform_configuration.xml
@@ -34,7 +34,7 @@
         <!--intf id="BE_HW_RX_INTF_3" name="BT_RX"/-->
         <intf id="BE_VIRTUAL_VOICE_RX_TUNING" block_id="19"/>
         <intf id="BE_VIRTUAL_VOICE_TX_TUNING" block_id="19"/>
-        <intf id="BE_HW_TX_INTF_0" block_id="134,128"/>
+        <intf id="BE_HW_TX_INTF_0" block_id="134,128,137"/>
     </hw_intf>
 
     <product_lists>
@@ -247,14 +247,14 @@
         <cfg id="IN_USB_TTY_VCO_MIC_BE_CFG" be_path="NULL" codec_path="voice-speaker-mic"/>
         <cfg id="IN_USB_TTY_HCO_MIC_BE_CFG" be_path="usb-headset-mic" codec_path="usb-headset-mic" mux="HW_MUX_GP_0"/>
         <cfg id="IN_SPK_VI_BE_CFG" codec_path="NULL" be_path="spk-vi"/>
-        <cfg id="IN_CAMCORDER_LANDSCAPE_BE_CFG" tuning_id="0"/>
-        <cfg id="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG" tuning_id="0"/>
-        <cfg id="IN_CAMCORDER_PORTRAIT_BE_CFG" tuning_id="0"/>
-        <cfg id="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG" tuning_id="0"/>
-        <cfg id="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG" tuning_id="0"/>
-        <cfg id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" tuning_id="0"/>
-        <cfg id="IN_CAMCORDER_MIC_BE_CFG" tuning_id="0"/>
-        <cfg id="IN_CAMCORDER_TRIPLE_MIC_BE_CFG" tuning_id="0"/>
+        <cfg id="IN_CAMCORDER_LANDSCAPE_BE_CFG" tuning_id="70"/>
+        <cfg id="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG" tuning_id="71"/>
+        <cfg id="IN_CAMCORDER_PORTRAIT_BE_CFG" tuning_id="72"/>
+        <cfg id="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG" tuning_id="73"/>
+        <cfg id="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG" tuning_id="74"/>
+        <cfg id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" tuning_id="75"/>
+        <cfg id="IN_CAMCORDER_MIC_BE_CFG" tuning_id="70"/>
+        <cfg id="IN_CAMCORDER_TRIPLE_MIC_BE_CFG" tuning_id="70"/>
         <cfg id="IN_BTSCO_MIC_BE_CFG" mux="HW_MUX_GP_0"/>
         <cfg id="IN_BTSCO_MIC_NREC_BE_CFG" mux="HW_MUX_GP_0"/>
         <cfg id="IN_BTSCO_MIC_WB_BE_CFG" mux="HW_MUX_GP_0"/>
diff --git a/audio/cloudripper/config/mixer_paths.xml b/audio/cloudripper/config/mixer_paths.xml
index 22c371b..9fef955 100644
--- a/audio/cloudripper/config/mixer_paths.xml
+++ b/audio/cloudripper/config/mixer_paths.xml
@@ -655,6 +655,7 @@
 
     <!-- Tx device -->
     <path name="handset-mic">
+        <ctl name="Mic Spatial Module Enable" value="1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
@@ -680,6 +681,7 @@
     </path>
 
     <path name="speaker-mic">
+        <ctl name="Mic Spatial Module Enable" value="1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
@@ -705,7 +707,7 @@
     </path>
 
     <path name="camcorder-mic">
-        <!--ctl name="Mic Spatial Module Enable" value="1"/-->
+        <ctl name="Mic Spatial Module Enable" value="1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
@@ -714,7 +716,7 @@
     </path>
 
     <path name="camcorder-mic-post">
-        <ctl name="MIC Record Soft Gain (dB)" value="22"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="0"/>
     </path>
 
     <path name="voice-recog-mic">
diff --git a/audio/panther/config/audio_platform_configuration.xml b/audio/panther/config/audio_platform_configuration.xml
index e541d18..c3ebb6f 100644
--- a/audio/panther/config/audio_platform_configuration.xml
+++ b/audio/panther/config/audio_platform_configuration.xml
@@ -34,7 +34,7 @@
         <!--intf id="BE_HW_RX_INTF_3" name="BT_RX"/-->
         <intf id="BE_VIRTUAL_VOICE_RX_TUNING" block_id="19"/>
         <intf id="BE_VIRTUAL_VOICE_TX_TUNING" block_id="19"/>
-        <intf id="BE_HW_TX_INTF_0" block_id="134,128"/>
+        <intf id="BE_HW_TX_INTF_0" block_id="134,128,137"/>
     </hw_intf>
 
     <product_lists>
@@ -247,6 +247,9 @@
         <cfg id="IN_USB_TTY_VCO_MIC_BE_CFG" be_path="NULL" codec_path="voice-speaker-mic"/>
         <cfg id="IN_USB_TTY_HCO_MIC_BE_CFG" be_path="usb-headset-mic" codec_path="usb-headset-mic" mux="HW_MUX_GP_0"/>
         <cfg id="IN_SPK_VI_BE_CFG" codec_path="NULL" be_path="spk-vi"/>
+        <cfg id="IN_HANDSET_MIC_BE_CFG" tuning_id="62"/>
+        <cfg id="IN_HANDSET_DUAL_MIC_BE_CFG" tuning_id="63"/>
+        <cfg id="IN_HANDSET_TRIPLE_MIC_BE_CFG" tuning_id="64"/>
         <cfg id="IN_CAMCORDER_LANDSCAPE_BE_CFG" tuning_id="70"/>
         <cfg id="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG" tuning_id="71"/>
         <cfg id="IN_CAMCORDER_PORTRAIT_BE_CFG" tuning_id="72"/>
diff --git a/audio/panther/config/mixer_paths.xml b/audio/panther/config/mixer_paths.xml
index 0235f46..00e252f 100644
--- a/audio/panther/config/mixer_paths.xml
+++ b/audio/panther/config/mixer_paths.xml
@@ -649,6 +649,7 @@
 
     <!-- Tx device -->
     <path name="handset-mic">
+        <ctl name="Mic Spatial Module Enable" value="1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
@@ -674,6 +675,7 @@
     </path>
 
     <path name="speaker-mic">
+        <ctl name="Mic Spatial Module Enable" value="1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
@@ -699,7 +701,7 @@
     </path>
 
     <path name="camcorder-mic">
-        <!--ctl name="Mic Spatial Module Enable" value="1"/-->
+        <ctl name="Mic Spatial Module Enable" value="1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
@@ -708,7 +710,7 @@
     </path>
 
     <path name="camcorder-mic-post">
-        <ctl name="MIC Record Soft Gain (dB)" value="22"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="0"/>
     </path>
 
     <path name="voice-recog-mic">
diff --git a/audio/ravenclaw/config/audio_platform_configuration.xml b/audio/ravenclaw/config/audio_platform_configuration.xml
index e541d18..5d2fbc8 100644
--- a/audio/ravenclaw/config/audio_platform_configuration.xml
+++ b/audio/ravenclaw/config/audio_platform_configuration.xml
@@ -34,7 +34,7 @@
         <!--intf id="BE_HW_RX_INTF_3" name="BT_RX"/-->
         <intf id="BE_VIRTUAL_VOICE_RX_TUNING" block_id="19"/>
         <intf id="BE_VIRTUAL_VOICE_TX_TUNING" block_id="19"/>
-        <intf id="BE_HW_TX_INTF_0" block_id="134,128"/>
+        <intf id="BE_HW_TX_INTF_0" block_id="134,128,137"/>
     </hw_intf>
 
     <product_lists>
diff --git a/audio/ravenclaw/config/mixer_paths.xml b/audio/ravenclaw/config/mixer_paths.xml
index a61996e..2d3db43 100644
--- a/audio/ravenclaw/config/mixer_paths.xml
+++ b/audio/ravenclaw/config/mixer_paths.xml
@@ -639,6 +639,7 @@
 
     <!-- Tx device -->
     <path name="handset-mic">
+        <ctl name="Mic Spatial Module Enable" value="1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
@@ -664,6 +665,7 @@
     </path>
 
     <path name="speaker-mic">
+        <ctl name="Mic Spatial Module Enable" value="1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
@@ -689,7 +691,7 @@
     </path>
 
     <path name="camcorder-mic">
-        <!--ctl name="Mic Spatial Module Enable" value="1"/-->
+        <ctl name="Mic Spatial Module Enable" value="1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
@@ -698,7 +700,7 @@
     </path>
 
     <path name="camcorder-mic-post">
-        <ctl name="MIC Record Soft Gain (dB)" value="22"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="0"/>
     </path>
 
     <path name="voice-recog-mic">