From ee35a818b678709e6ec80a4beff72646bd3a8571 Mon Sep 17 00:00:00 2001
From: AnierinB <anierin@evolution-x.org>
Date: Tue, 12 Aug 2025 13:09:32 -0700
Subject: [PATCH] milanf: audio: Update configs from stock

Change-Id: Ifdbf0b090e76e93055723718629346e26568bed3
Signed-off-by: AnierinB <anierin@evolution-x.org>
---
 audio/audio_platform_info.xml   |  31 ++--
 audio/audio_policy_volumes.xml  |  38 ++--
 audio/default_volume_tables.xml |  18 +-
 audio/mixer_paths.xml           | 299 +++++++++-----------------------
 4 files changed, 125 insertions(+), 261 deletions(-)

diff --git a/audio/audio_platform_info.xml b/audio/audio_platform_info.xml
index a82a8df..ef0fa94 100644
--- a/audio/audio_platform_info.xml
+++ b/audio/audio_platform_info.xml
@@ -148,7 +148,6 @@
 	<device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" acdb_id="9" />
 	<device name="SND_DEVICE_OUT_SPEAKER_SAFE_AND_HEADPHONES" acdb_id="9" />
 	<device name="SND_DEVICE_OUT_SPEAKER" acdb_id="14" />
-	<device name="SND_DEVICE_OUT_SPEAKER_RIGHT" acdb_id="13" />
 	<device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" acdb_id="14" />
 	<device name="SND_DEVICE_OUT_SPEAKER_REVERSE" acdb_id="14" />
 	<device name="SND_DEVICE_OUT_SPEAKER_SAFE" acdb_id="14" />
@@ -178,7 +177,7 @@
 	<device name="SND_DEVICE_IN_HANDSET_MIC_NS" acdb_id="4" />
 	<device name="SND_DEVICE_IN_HANDSET_MIC_NN" acdb_id="318" />
 	<device name="SND_DEVICE_IN_HANDSET_MIC_TOP" acdb_id="4" />
-	<device name="SND_DEVICE_IN_HANDSET_MIC_NN_TOP" acdb_id="4" />
+	<device name="SND_DEVICE_IN_HANDSET_MIC_NN_TOP" acdb_id="318" />
 	<device name="SND_DEVICE_IN_SPEAKER_DMIC" acdb_id="35" />
 	<device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC" acdb_id="35" />
 	<device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS" acdb_id="35" />
@@ -195,7 +194,6 @@
 	<device name="SND_DEVICE_IN_UNPROCESSED_MIC" acdb_id="11" />
 	<device name="SND_DEVICE_IN_VOICE_DMIC_TMUS" acdb_id="41" />
 	<device name="SND_DEVICE_IN_HEADSET_MIC_AEC" acdb_id="47" />
-	<device name="SND_DEVICE_IN_HEADSET_MIC_CQA" acdb_id="60" />
 	<device name="SND_DEVICE_IN_CAMCORDER_MIC" acdb_id="61" />
 	<device name="SND_DEVICE_IN_VOICE_REC_MIC" acdb_id="62" />
 	<device name="SND_DEVICE_IN_VOICE_REC_MIC_AEC" acdb_id="62" />
@@ -265,11 +263,11 @@
         <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
-        <device name="SND_DEVICE_OUT_HANDSET" backend="handset" interface="SEC_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_CQA_HANDSET" backend="handset" interface="SEC_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_VOLTE_NB_HANDSET_TMUS" backend="handset" interface="SEC_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_VOLTE_NB_ANC_HANDSET" backend="handset" interface="SEC_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_VOICE_HAC_HANDSET" backend="handset" interface="SEC_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_HANDSET" backend="handset" interface="RX_CDC_DMA_RX_0"/>
+        <device name="SND_DEVICE_OUT_CQA_HANDSET" backend="handset" interface="RX_CDC_DMA_RX_0"/>
+        <device name="SND_DEVICE_OUT_VOLTE_NB_HANDSET_TMUS" backend="handset" interface="RX_CDC_DMA_RX_0"/>
+        <device name="SND_DEVICE_OUT_VOLTE_NB_ANC_HANDSET" backend="handset" interface="RX_CDC_DMA_RX_0"/>
+        <device name="SND_DEVICE_OUT_VOICE_HAC_HANDSET" backend="handset" interface="RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_SPEAKER" interface="SEC_MI2S_RX"/>
         <device name="SND_DEVICE_OUT_CQA_SPEAKER" interface="SEC_MI2S_RX"/>
         <device name="SND_DEVICE_OUT_VOLTE_NB_SPEAKER" interface="SEC_MI2S_RX"/>
@@ -277,16 +275,14 @@
         <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_2" interface="SEC_MI2S_RX"/>
         <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" interface="SEC_MI2S_RX"/>
         <device name="SND_DEVICE_OUT_SPEAKER_SAFE" interface="SEC_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_LEFT" interface="SEC_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_RIGHT" interface="SEC_MI2S_RX"/>
         <device name="SND_DEVICE_OUT_SPEAKER_VBAT" interface="SEC_MI2S_RX"/>
         <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1" interface="SEC_MI2S_RX-and-RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2" interface="SEC_MI2S_RX-and-RX_CDC_DMA_RX_0"/>
-        <device name="SND_DEVICE_OUT_VOICE_HANDSET" backend="handset" interface="SEC_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_VOICE_ANC_HANDSET" backend="handset" interface="SEC_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_VOLTE_NB_HANDSET" backend="handset" interface="SEC_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_VOLTE_NB_HAC_HANDSET" backend="handset" interface="SEC_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_VOICE_HANDSET_TMUS" backend="handset" interface="SEC_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_VOICE_HANDSET" backend="handset" interface="RX_CDC_DMA_RX_0"/>
+        <device name="SND_DEVICE_OUT_VOICE_ANC_HANDSET" backend="handset" interface="RX_CDC_DMA_RX_0"/>
+        <device name="SND_DEVICE_OUT_VOLTE_NB_HANDSET" backend="handset" interface="RX_CDC_DMA_RX_0"/>
+        <device name="SND_DEVICE_OUT_VOLTE_NB_HAC_HANDSET" backend="handset" interface="RX_CDC_DMA_RX_0"/>
+        <device name="SND_DEVICE_OUT_VOICE_HANDSET_TMUS" backend="handset" interface="RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_IN_HANDSET_GENERIC_QMIC" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_OUT_VOICE_SPEAKER" interface="SEC_MI2S_RX"/>
         <device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO" interface="SEC_MI2S_RX"/>
@@ -297,10 +293,10 @@
         <device name="SND_DEVICE_OUT_SPEAKER_AND_DISPLAY_PORT" interface="SEC_MI2S_RX-and-DISPLAY_PORT"/>
         <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP" interface="SEC_MI2S_RX-and-SLIMBUS_7_RX"/>
         <device name="SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_A2DP" interface="SEC_MI2S_RX-and-SLIMBUS_7_RX"/>
-        <device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" backend="handset" interface="SEC_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" backend="handset" interface="RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_ANC_FB_HEADSET" interface="RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_VOICE_ANC_FB_HEADSET" interface="RX_CDC_DMA_RX_0"/>
-        <device name="SND_DEVICE_OUT_ANC_HANDSET" interface="SEC_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_ANC_HANDSET" interface="RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" interface="SEC_MI2S_RX"/>
         <device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED" interface="SEC_MI2S_RX"/>
         <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED" interface="SEC_MI2S_RX"/>
@@ -349,7 +345,6 @@
         <device name="SND_DEVICE_IN_VOICE_REC_EXTERNAL_MIC_NN" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>
         <device name="SND_DEVICE_IN_HEADSET_MIC_AEC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>
         <device name="SND_DEVICE_IN_HEADSET_MIC_AEC_NN" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>
-        <device name="SND_DEVICE_IN_HEADSET_MIC_CQA" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>
         <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_NN" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_HDMI_MIC" interface="HDMI"/>
diff --git a/audio/audio_policy_volumes.xml b/audio/audio_policy_volumes.xml
index fc66090..88598f4 100644
--- a/audio/audio_policy_volumes.xml
+++ b/audio/audio_policy_volumes.xml
@@ -8,24 +8,16 @@ volume index from 0 to 100.
 </volume>
 -->
 <volumes>
-    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_HEADSET">
-        <point>0,-3000</point>
-        <point>33,-2000</point>
-        <point>66,-1000</point>
-        <point>100,0</point>
-    </volume>
+    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_HEADSET"
+                                             ref="DEFAULT_VOICE_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-2300</point>
-        <point>33,-1400</point>
-        <point>66,-650</point>
-        <point>100,0</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EARPIECE">
-        <point>0,-2400</point>
-        <point>33,-1600</point>
-        <point>66,-800</point>
+        <point>0,-3300</point>
+        <point>33,-2100</point>
+        <point>66,-1100</point>
         <point>100,0</point>
     </volume>
+    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+                                             ref="DEFAULT_VOICE_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
                                              ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_HEADSET">
@@ -34,8 +26,12 @@ volume index from 0 to 100.
         <point>66,-2200</point>
         <point>100,-1800</point>
     </volume>
-    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                         ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-3600</point>
+        <point>33,-2700</point>
+        <point>66,-1800</point>
+        <point>100,-900</point>
+    </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                          ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
@@ -67,10 +63,10 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                                ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-5300</point>
-        <point>70,-2890</point>
-        <point>84,-2010</point>
-        <point>100,-1300</point>
+        <point>1,-3500</point>
+        <point>33,-2100</point>
+        <point>66,-1300</point>
+        <point>100,-500</point>
     </volume>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
diff --git a/audio/default_volume_tables.xml b/audio/default_volume_tables.xml
index 70eacee..1cd603a 100644
--- a/audio/default_volume_tables.xml
+++ b/audio/default_volume_tables.xml
@@ -41,9 +41,9 @@
     </reference>
     <reference name="DEFAULT_MEDIA_VOLUME_CURVE">
     <!-- Default Media reference Volume Curve -->
-        <point>1,-4800</point>
-        <point>34,-3200</point>
-        <point>67,-1600</point>
+        <point>1,-5400</point>
+        <point>34,-3600</point>
+        <point>67,-1800</point>
         <point>100,0</point>
     </reference>
     <reference name="DEFAULT_VOICE_VOLUME_CURVE">
@@ -62,12 +62,12 @@
     </reference>
     <reference name="DEFAULT_DEVICE_CATEGORY_SPEAKER_VOLUME_CURVE">
     <!-- Default is Speaker Media Volume Curve -->
-        <point>1,-5400</point>
-        <point>30,-3300</point>
-        <point>43,-2400</point>
-        <point>65,-1400</point>
-        <point>85,-750</point>
-        <point>93,-500</point>
+        <point>1,-6500</point>
+        <point>33,-4600</point>
+        <point>50,-3900</point>
+        <point>66,-3300</point>
+        <point>80,-2700</point>
+        <point>90,-1400</point>
         <point>100,0</point>
     </reference>
     <reference name="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE">
diff --git a/audio/mixer_paths.xml b/audio/mixer_paths.xml
index e142fe0..40b5acd 100644
--- a/audio/mixer_paths.xml
+++ b/audio/mixer_paths.xml
@@ -26,15 +26,6 @@
 <!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                          -->
 <mixer>
     <!-- These are the initial mixer settings -->
-    <ctl name="Voice Rx Device Mute" id="0" value="0" />
-    <ctl name="Voice Rx Device Mute" id="1" value="-1" />
-    <ctl name="Voice Rx Device Mute" id="2" value="20" />
-    <ctl name="Voice Tx Mute" id="0" value="0" />
-    <ctl name="Voice Tx Mute" id="1" value="-1" />
-    <ctl name="Voice Tx Mute" id="2" value="500" />
-    <ctl name="Voice Rx Gain" id="0" value="0" />
-    <ctl name="Voice Rx Gain" id="1" value="-1" />
-    <ctl name="Voice Rx Gain" id="2" value="20" />
     <ctl name="Voice Sidetone Enable" value="0" />
     <ctl name="Voip Tx Mute" id="0" value="0" />
     <ctl name="Voip Tx Mute" id="1" value="500" />
@@ -46,9 +37,6 @@
     <ctl name="Voip Evrc Min Max Rate Config" id="1" value="4" />
     <ctl name="Voip Dtx Mode" value="0" />
     <ctl name="TTY Mode" value="OFF" />
-    <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="0" />
-    <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="0" />
-    <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia5" value="0" />
     <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia7" value="0" />
     <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia8" value="0" />
     <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="0" />
@@ -62,8 +50,6 @@
     <ctl name="MultiMedia5 Mixer TX_CDC_DMA_TX_3" value="0" />
     <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_3" value="0" />
     <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_4" value="0" />
-    <ctl name="MultiMedia1 Mixer SLIM_7_TX" value="0" />
-    <ctl name="MultiMedia8 Mixer SLIM_7_TX" value="0" />
     <ctl name="MultiMedia10 Mixer TX_CDC_DMA_TX_3" value="0" />
     <ctl name="MultiMedia10 Mixer TX_CDC_DMA_TX_4" value="0" />
     <ctl name="MultiMedia10 Mixer SLIM_7_TX" value="0" />
@@ -103,6 +89,7 @@
     <ctl name="DISPLAY_PORT1 Mixer MultiMedia14" value="0" />
     <ctl name="DISPLAY_PORT1 Mixer MultiMedia15" value="0" />
     <ctl name="DISPLAY_PORT1 Mixer MultiMedia16" value="0" />
+    <ctl name="HDMI Mixer MultiMedia16" value="0" />
     <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia1" value="0" />
     <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia2" value="0" />
     <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia3" value="0" />
@@ -131,6 +118,9 @@
     <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia14" value="0" />
     <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia15" value="0" />
     <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="0" />
+    <ctl name="RX_CDC_DMA_RX_5 Audio Mixer MultiMedia4" value="0" />
+    <ctl name="MultiMedia2 Mixer TX_CDC_DMA_TX_3" value="0" />
+    <ctl name="MultiMedia2 Mixer TX_CDC_DMA_TX_4" value="0" />
     <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia1" value="0" />
     <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia2" value="0" />
     <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia3" value="0" />
@@ -152,16 +142,12 @@
     <ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="0" />
     <ctl name="MultiMedia17 Mixer USB_AUDIO_TX" value="0" />
     <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
+    <ctl name="TX_CDC_DMA_TX_4 Channels" value="One" />
     <ctl name="RX_CDC_DMA_RX_1 Channels" value="One" />
     <ctl name="RX_CDC_DMA_RX_0 Channels" value="One" />
     <ctl name="VI_FEED_TX Channels" value="Two" />
-    <ctl name="RX_CDC_DMA_RX_1 Format" value="UNPACKED" />
-    <ctl name="RX_CDC_DMA_RX_0 Format" value="UNPACKED" />
-    <ctl name="TX_CDC_DMA_TX_3 Format" value="UNPACKED" />
     <!-- HFP start -->
     <ctl name="HFP_SLIM7_UL_HL Switch" value="0" />
-    <ctl name="RX_CDC_DMA_RX_1 Port Mixer SLIM_7_TX" value="0" />
-    <ctl name="RX_CDC_DMA_RX_0 Port Mixer SLIM_7_TX" value="0" />
     <!-- HFP end -->
     <!-- echo reference -->
     <ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />
@@ -170,8 +156,11 @@
     <!-- usb headset -->
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="0" />
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="0" />
+    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia3" value="0" />
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="0" />
+    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="0" />
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia7" value="0" />
+    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia8" value="0" />
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="0" />
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia11" value="0" />
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia12" value="0" />
@@ -180,7 +169,7 @@
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia15" value="0" />
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia16" value="0" />
     <ctl name="MultiMedia1 Mixer AFE_PCM_TX" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="0" />
+
     <!-- usb headset end -->
     <!-- fm -->
     <ctl name="SLIMBUS_8 LOOPBACK Volume" value="0" />
@@ -190,6 +179,7 @@
     <ctl name="RX_CDC_DMA_RX_0_DL_HL Switch" value="0" />
     <ctl name="MultiMedia1 Mixer SLIM_8_TX" value="0" />
     <ctl name="MultiMedia2 Mixer SLIM_8_TX" value="0" />
+    <ctl name="MultiMedia8 Mixer INTERNAL_FM_TX" value="0" />
     <!-- fm end -->
 
     <!-- Multimode Voice1 -->
@@ -207,6 +197,7 @@
     <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="0" />
     <!-- Multimode Voice1 Display-Port -->
     <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode1" value="0" />
+    <ctl name="DISPLAY_PORT_RX1_Voice Mixer VoiceMMode1" value="0" />
     <!-- Multimode Voice1 proxy-Port -->
     <ctl name="PROXY_RX_Voice Mixer VoiceMMode1" value="0" />
     <ctl name="VoiceMMode1_Tx Mixer PROXY_TX_MMode1" value="0" />
@@ -227,6 +218,7 @@
     <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="0" />
     <!-- Multimode Voice2 Display-Port -->
     <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode2" value="0" />
+    <ctl name="DISPLAY_PORT_RX1_Voice Mixer VoiceMMode2" value="0" />
     <!-- Multimode Voice2 proxy-Port -->
     <ctl name="PROXY_RX_Voice Mixer VoiceMMode2" value="0" />
     <ctl name="VoiceMMode2_Tx Mixer PROXY_TX_MMode2" value="0" />
@@ -251,6 +243,7 @@
     <!-- Incall Music -->
     <ctl name="Incall_Music Audio Mixer MultiMedia2" value="0" />
     <ctl name="Incall_Music Audio Mixer MultiMedia9" value="0" />
+    <ctl name="Incall_Music_2 Audio Mixer MultiMedia9" value="0" />
     <!-- Incall Music End -->
 
     <!-- compress-voip-call start -->
@@ -274,6 +267,7 @@
     <ctl name="MultiMedia1 Mixer SLIM_7_TX" value="0" />
     <!-- audio record compress-->
     <ctl name="MultiMedia8 Mixer TX_CDC_DMA_TX_3" value="0" />
+    <ctl name="MultiMedia8 Mixer TX_CDC_DMA_TX_4" value="0" />
     <ctl name="MultiMedia8 Mixer SLIM_7_TX" value="0" />
     <ctl name="MultiMedia8 Mixer AFE_PCM_TX" value="0" />
     <!-- audio record compress end-->
@@ -284,26 +278,19 @@
     <ctl name="SLIM7_RX ADM Channels" value="Zero" />
     <!-- split a2dp end-->
 
-    <!-- ADSP testfwk -->
-    <ctl name="RX_CDC_DMA_RX_1_DL_HL Switch" value="0" />
-    <ctl name="RX_CDC_DMA_RX_0_DL_HL Switch" value="0" />
-    <!-- ADSP testfwk end-->
-
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia3" value="0" />
-
     <!-- Codec controls -->
 
     <!-- RX Controls -->
     <ctl name="RX_MACRO RX0 MUX" value="ZERO" />
     <ctl name="RX_MACRO RX1 MUX" value="ZERO" />
-    <ctl name="RX_CDC_DMA_RX_0 Channels" value="One" />
+    <ctl name="RX INT0 MIX2 INP" value="ZERO" />
+    <ctl name="RX INT1 MIX2 INP" value="ZERO" />
     <ctl name="RX INT0_1 MIX1 INP0" value="ZERO" />
     <ctl name="RX INT0_1 MIX1 INP1" value="ZERO" />
     <ctl name="RX INT0_1 MIX1 INP2" value="ZERO" />
     <ctl name="RX INT1_1 MIX1 INP0" value="ZERO" />
     <ctl name="RX INT1_1 MIX1 INP1" value="ZERO" />
     <ctl name="RX INT1_1 MIX1 INP2" value="ZERO" />
-    <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="0" />
     <ctl name="RX INT0 DEM MUX" value="NORMAL_DSM_OUT" />
     <ctl name="RX INT1 DEM MUX" value="NORMAL_DSM_OUT" />
     <ctl name="RX_COMP1 Switch" value="0" />
@@ -314,26 +301,21 @@
     <ctl name="HPHL_RDAC Switch" value="0" />
     <ctl name="HPHR_RDAC Switch" value="0" />
     <ctl name="AUX_RDAC Switch" value="0" />
-    <ctl name="RDAC3_MUX" value="ZERO" />
+    <ctl name="RDAC3_MUX" value="RX1" />
     <ctl name="RX_EAR Mode" value="OFF" />
-    <ctl name="HPH_L Switch" value="0" />
-    <ctl name="HPH_R Switch" value="0" />
-    <ctl name="DSD_L Switch" value="0" />
-    <ctl name="DSD_R Switch" value="0" />
 
     <!-- TX Controls -->
-    <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
-    <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_3" value="0" />
-    <ctl name="ADC2_MIXER Switch" value="0" />
+    <ctl name="ADC1_MIXER Switch" value="Off" />
+    <ctl name="ADC1 ChMap" value="ZERO" />
+    <ctl name="ADC2_MIXER Switch" value="Off" />
+    <ctl name="ADC2 ChMap" value="ZERO" />
+    <ctl name="MBHC ChMap" value="ZERO" />
     <ctl name="DEC0_BCS Switch" value="0" />
     <ctl name="TX_AIF1_CAP Mixer DEC0" value="0" />
     <ctl name="TX_AIF1_CAP Mixer DEC1" value="0" />
     <ctl name="TX_AIF1_CAP Mixer DEC2" value="0" />
     <ctl name="TX_AIF1_CAP Mixer DEC3" value="0" />
-    <ctl name="TX_AIF1_CAP Mixer DEC4" value="0" />
-    <ctl name="TX_AIF1_CAP Mixer DEC5" value="0" />
-    <ctl name="TX_AIF1_CAP Mixer DEC6" value="0" />
-    <ctl name="TX_AIF1_CAP Mixer DEC7" value="0" />
+    <ctl name="TX_AIF2_CAP Mixer DEC0" value="0" />
     <ctl name="TX DEC0 MUX" value="MSM_DMIC" />
     <ctl name="TX DMIC MUX0" value="ZERO" />
     <ctl name="TX SMIC MUX0" value="ZERO" />
@@ -346,18 +328,6 @@
     <ctl name="TX DEC3 MUX" value="MSM_DMIC" />
     <ctl name="TX DMIC MUX3" value="ZERO" />
     <ctl name="TX SMIC MUX3" value="ZERO" />
-    <ctl name="TX DEC4 MUX" value="MSM_DMIC" />
-    <ctl name="TX DMIC MUX4" value="ZERO" />
-    <ctl name="TX SMIC MUX4" value="ZERO" />
-    <ctl name="TX DEC5 MUX" value="MSM_DMIC" />
-    <ctl name="TX DMIC MUX5" value="ZERO" />
-    <ctl name="TX SMIC MUX5" value="ZERO" />
-    <ctl name="TX DEC6 MUX" value="MSM_DMIC" />
-    <ctl name="TX DMIC MUX6" value="ZERO" />
-    <ctl name="TX SMIC MUX6" value="ZERO" />
-    <ctl name="TX DEC7 MUX" value="MSM_DMIC" />
-    <ctl name="TX DMIC MUX7" value="ZERO" />
-    <ctl name="TX SMIC MUX7" value="ZERO" />
 
     <!-- Volume controls -->
     <ctl name="RX_RX0 Digital Volume" value="84" />
@@ -365,25 +335,17 @@
     <ctl name="RX_RX2 Digital Volume" value="84" />
     <ctl name="HPHL Volume" value="20" />
     <ctl name="HPHR Volume" value="20" />
-    <ctl name="EAR SPKR PA Gain" value="G_DEFAULT" />
+    <ctl name="EAR PA GAIN" value="G_6_DB" />
 
     <ctl name="TX_DEC0 Volume" value="84" />
     <ctl name="TX_DEC1 Volume" value="84" />
     <ctl name="TX_DEC2 Volume" value="84" />
     <ctl name="TX_DEC3 Volume" value="84" />
-    <ctl name="TX_DEC4 Volume" value="84" />
-    <ctl name="TX_DEC5 Volume" value="84" />
-    <ctl name="TX_DEC6 Volume" value="84" />
-    <ctl name="TX_DEC7 Volume" value="84" />
 
     <ctl name="ADC1 Volume" value="12" />
     <ctl name="ADC2 Volume" value="12" />
     <ctl name="ADC3 Volume" value="12" />
 
-    <!-- Compander controls -->
-    <ctl name="COMP7 Switch" value="0" />
-    <ctl name="COMP8 Switch" value="0" />
-
     <!-- Headphone class-H mode  -->
     <ctl name="RX_HPH_PWR_MODE" value="ULP" />
     <ctl name="RX HPH Mode" value="CLS_H_ULP" />
@@ -419,14 +381,14 @@
     <ctl name="IIR0 Enable Band3" value="0" />
     <ctl name="IIR0 Enable Band4" value="0" />
     <ctl name="IIR0 Enable Band5" value="0" />
-    <ctl name="IIR0 INP0 Volume" value="54" />
+    <ctl name="IIR0 INP0 Volume" value="40" />
     <ctl name="IIR0 INP0 MUX" value="ZERO" />
     <ctl name="IIR0 INP1 MUX" value="ZERO" />
     <ctl name="IIR0 INP2 MUX" value="ZERO" />
     <ctl name="IIR0 INP3 MUX" value="ZERO" />
 
     <!-- vbat related data -->
-    <ctl name="GSM mode Enable" value="OFF" />
+    <ctl name="RX_GSM mode Enable" value="OFF" />
     <ctl name="RX_Softclip Enable" value="0" />
     <ctl name="RX INT2_1 VBAT RX AUX VBAT Enable" value="0" />
 
@@ -435,42 +397,21 @@
     <!-- defaults for mmap record -->
     <ctl name="MultiMedia16 Mixer TX_CDC_DMA_TX_3" value="0" />
     <ctl name="MultiMedia16 Mixer TX_CDC_DMA_TX_4" value="0" />
-    <ctl name="MultiMedia16 Mixer SLIM_7_TX" value="0" />
-    <ctl name="MultiMedia16 Mixer TERT_MI2S_TX" value="0" />
-    <ctl name="MultiMedia16 Mixer SLIM_8_TX" value="0" />
+    <ctl name="MultiMedia16 Mixer INTERNAL_BT_SCO_TX" value="0" />
+    <ctl name="MultiMedia16 Mixer INTERNAL_FM_TX" value="0" />
     <ctl name="MultiMedia16 Mixer USB_AUDIO_TX" value="0" />
 
     <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="0"/>
     <ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="0"/>
-    <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia31" value="0" />
     <ctl name="RX_CDC_DMA_RX_6 Channels" value="One" />
 
-    <ctl name="SEC_MI2S_RX Channels" value="Two" />
+    <ctl name="SEC_MI2S_RX Channels" value="One" />
     <ctl name="SEC_MI2S_TX Channels" value="Two" />
-
-    <ctl name="SEC_MI2S_RX Format" value="S32_LE" />
-    <ctl name="SEC_MI2S_TX Format" value="S32_LE" />
-
     <ctl name="SEC_MI2S_RX_VI_FB_MUX" value="ZERO" />
 
-    <ctl name="aw_dev_0_switch" value="Enable" />
-    <ctl name="aw_dev_1_switch" value="Enable" />
-    <ctl name="aw_dev_0_prof" value="Music" />
-    <ctl name="aw_dev_1_prof" value="Music" />
-
-    <ctl name="aw882xx_rx_switch" value="Disable" />
-    <ctl name="aw882xx_tx_switch" value="Disable" />
-    <ctl name="aw882xx_algo_cali_switch" value="Off" />
-    <ctl name="aw882xx_algo_bypass_switch" value="Off" />
-    <ctl name="aw882xx_algo_handset_switch" value="Off" />
-    <ctl name="aw882xx_algo_voice_switch" value="Off" />
-    <ctl name="aw882xx_algo_voip_switch" value="Off" />
-    <ctl name="aw882xx_algo_music_deepbuffer_switch" value="Off" />
-    <ctl name="aw882xx_algo_music_fasttrack_switch" value="Off" />
-
     <!-- These are audio route (FE to BE) specific mixer settings -->
     <path name="gsm-mode">
-        <ctl name="GSM mode Enable" value="ON" />
+        <ctl name="RX_GSM mode Enable" value="ON" />
     </path>
 
     <path name="echo-reference">
@@ -479,7 +420,7 @@
     </path>
 
     <path name="echo-reference handset">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="SEC_I2S_RX" />
+        <ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_0" />
         <ctl name="EC Reference Channels" value="One"/>
     </path>
 
@@ -525,7 +466,7 @@
     </path>
 
     <path name="echo-reference-voip handset">
-        <ctl name="AUDIO_REF_EC_UL10 MUX" value="SEC_I2S_RX" />
+        <ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_0" />
         <ctl name="EC Reference Channels" value="One"/>
     </path>
 
@@ -534,6 +475,11 @@
         <ctl name="EC Reference Channels" value="Two"/>
     </path>
 
+    <path name="echo-reference-voip usb-headphones">
+        <ctl name="AUDIO_REF_EC_UL10 MUX" value="USB_AUDIO_RX" />
+        <ctl name="EC Reference Channels" value="Two"/>
+    </path>
+
     <path name="echo-reference-voip bt-sco">
         <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_7_RX" />
         <ctl name="EC Reference Channels" value="Two"/>
@@ -549,12 +495,10 @@
 
     <path name="deep-buffer-playback">
         <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia1" value="1" />
-        <ctl name="aw882xx_algo_music_deepbuffer_switch" value="On" />
-	<ctl name="aw882xx_spin_relase_time" value="100" />
     </path>
 
     <path name="deep-buffer-playback handset">
-        <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia1" value="1" />
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="1" />
     </path>
 
     <path name="deep-buffer-playback speaker-protected">
@@ -683,12 +627,10 @@
 
     <path name="low-latency-playback">
         <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia5" value="1" />
-        <ctl name="aw882xx_algo_music_fasttrack_switch" value="On" />
-	<ctl name="aw882xx_spin_relase_time" value="100" />
     </path>
 
     <path name="low-latency-playback handset">
-        <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia5" value="1" />
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia5" value="1" />
     </path>
 
     <path name="low-latency-playback speaker-protected">
@@ -824,7 +766,7 @@
     </path>
 
     <path name="audio-ull-playback handset">
-        <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia8" value="1" />
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia8" value="1" />
     </path>
 
     <path name="audio-ull-playback speaker-protected">
@@ -956,12 +898,10 @@
 
     <path name="compress-offload-playback">
         <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia4" value="1" />
-        <ctl name="aw882xx_algo_music_deepbuffer_switch" value="On" />
-	<ctl name="aw882xx_spin_relase_time" value="100" />
     </path>
 
     <path name="compress-offload-playback handset">
-        <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia4" value="1" />
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia4" value="1" />
     </path>
 
     <path name="compress-offload-playback speaker-protected">
@@ -1106,12 +1046,10 @@
 
     <path name="compress-offload-playback2">
         <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia7" value="1" />
-        <ctl name="aw882xx_algo_music_deepbuffer_switch" value="On" />
-	<ctl name="aw882xx_spin_relase_time" value="100" />
     </path>
 
     <path name="compress-offload-playback2 handset">
-        <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia7" value="1" />
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia7" value="1" />
     </path>
 
     <path name="compress-offload-playback2 display-port">
@@ -1236,11 +1174,10 @@
 
     <path name="compress-offload-playback3">
         <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia10" value="1" />
-        <ctl name="aw882xx_algo_music_deepbuffer_switch" value="On" />
     </path>
 
     <path name="compress-offload-playback3 handset">
-        <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia10" value="1" />
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="1" />
     </path>
 
     <path name="compress-offload-playback3 display-port">
@@ -1364,11 +1301,10 @@
 
     <path name="compress-offload-playback4">
         <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia11" value="1" />
-        <ctl name="aw882xx_algo_music_deepbuffer_switch" value="On" />
     </path>
 
     <path name="compress-offload-playback4 handset">
-        <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia11" value="1" />
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia11" value="1" />
     </path>
 
     <path name="compress-offload-playback4 display-port">
@@ -1492,11 +1428,10 @@
 
     <path name="compress-offload-playback5">
         <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia12" value="1" />
-        <ctl name="aw882xx_algo_music_deepbuffer_switch" value="On" />
     </path>
 
     <path name="compress-offload-playback5 handset">
-        <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia12" value="1" />
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia12" value="1" />
     </path>
 
     <path name="compress-offload-playback5 display-port">
@@ -1620,11 +1555,10 @@
 
     <path name="compress-offload-playback6">
         <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia13" value="1" />
-        <ctl name="aw882xx_algo_music_deepbuffer_switch" value="On" />
     </path>
 
     <path name="compress-offload-playback6 handset">
-        <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia13" value="1" />
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia13" value="1" />
     </path>
 
     <path name="compress-offload-playback6 display-port">
@@ -1748,11 +1682,10 @@
 
     <path name="compress-offload-playback7">
         <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia14" value="1" />
-        <ctl name="aw882xx_algo_music_deepbuffer_switch" value="On" />
     </path>
 
     <path name="compress-offload-playback7 handset">
-        <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia14" value="1" />
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia14" value="1" />
     </path>
 
     <path name="compress-offload-playback7 display-port">
@@ -1876,11 +1809,10 @@
 
     <path name="compress-offload-playback8">
         <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia15" value="1" />
-        <ctl name="aw882xx_algo_music_deepbuffer_switch" value="On" />
     </path>
 
     <path name="compress-offload-playback8 handset">
-        <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia15" value="1" />
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia15" value="1" />
     </path>
 
     <path name="compress-offload-playback8 display-port">
@@ -2004,11 +1936,10 @@
 
     <path name="compress-offload-playback9">
         <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia16" value="1" />
-        <ctl name="aw882xx_algo_music_deepbuffer_switch" value="On" />
     </path>
 
     <path name="compress-offload-playback9 handset">
-        <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia16" value="1" />
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="1" />
     </path>
 
     <path name="compress-offload-playback9 display-port">
@@ -2235,7 +2166,7 @@
     </path>
 
     <path name="low-latency-record capture-fm">
-      <ctl name="MultiMedia8 Mixer SLIM_8_TX" value="1" />
+      <ctl name="MultiMedia8 Mixer INTERNAL_FM_TX" value="1" />
     </path>
 
     <path name="fm-virtual-record capture-fm">
@@ -2282,6 +2213,10 @@
         <path name="incall-rec-uplink" />
     </path>
 
+    <path name="incall-rec-uplink-compress">
+        <ctl name="MultiMedia8 Mixer VOC_REC_UL" value="1" />
+    </path>
+
     <path name="incall-rec-uplink-compress headset-mic">
         <path name="incall-rec-uplink-compress" />
     </path>
@@ -2294,13 +2229,6 @@
         <path name="incall-rec-uplink" />
     </path>
 
-    <path name="incall-rec-uplink-compress headset-mic">
-        <path name="incall-rec-uplink-compress" />
-    </path>
-    <path name="incall-rec-uplink-compress">
-        <ctl name="MultiMedia8 Mixer VOC_REC_UL" value="1" />
-    </path>
-
     <path name="incall-rec-uplink-compress bt-sco">
         <path name="incall-rec-uplink-compress" />
     </path>
@@ -2321,10 +2249,6 @@
         <path name="incall-rec-uplink-compress" />
     </path>
 
-    <path name="incall-rec-uplink-compress headset-mic">
-        <path name="incall-rec-uplink-compress" />
-    </path>
-
     <path name="incall-rec-downlink">
         <ctl name="MultiMedia9 Mixer VOC_REC_DL"  value="1" />
     </path>
@@ -2464,11 +2388,10 @@
     <path name="compress-voip-call">
         <ctl name="SEC_MI2S_RX_Voice Mixer Voip" value="1" />
         <ctl name="Voip_Tx Mixer TX_CDC_DMA_TX_3_Voip" value="1" />
-        <ctl name="aw882xx_algo_voip_switch" value="On" />
     </path>
 
     <path name="compress-voip-call handset">
-        <ctl name="SEC_MI2S_RX_Voice Mixer Voip" value="1" />
+        <ctl name="RX_CDC_DMA_RX_0_Voice Mixer Voip" value="1" />
         <ctl name="Voip_Tx Mixer TX_CDC_DMA_TX_3_Voip" value="1" />
     </path>
 
@@ -2519,8 +2442,6 @@
     <path name="voicemmode1-call">
         <ctl name="SEC_MI2S_RX_Voice Mixer VoiceMMode1" value="1" />
         <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />
-        <ctl name="aw882xx_algo_voice_switch" value="On" />
-	<ctl name="aw882xx_spin_relase_time" value="100" />
     </path>
 
     <path name="voicemmode1-call hearing-aid">
@@ -2534,9 +2455,8 @@
     </path>
 
     <path name="voicemmode1-call handset">
-        <ctl name="SEC_MI2S_RX_Voice Mixer VoiceMMode1" value="1" />
+        <ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode1" value="1" />
         <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />
-        <ctl name="aw882xx_algo_handset_switch" value="On" />
     </path>
 
     <path name="voicemmode1-call headphones">
@@ -2584,7 +2504,7 @@
     </path>
 
     <path name="voicemmode1-call display-port1-and-usb-headset-mic">
-        <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode1" value="1" />
+        <ctl name="DISPLAY_PORT_RX1_Voice Mixer VoiceMMode1" value="1" />
         <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" />
     </path>
 
@@ -2594,21 +2514,18 @@
     </path>
 
     <path name="voicemmode1-call display-port1">
-        <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode1" value="1" />
+        <ctl name="DISPLAY_PORT_RX1_Voice Mixer VoiceMMode1" value="1" />
         <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />
     </path>
 
     <path name="voicemmode2-call">
         <ctl name="SEC_MI2S_RX_Voice Mixer VoiceMMode2" value="1" />
         <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
-        <ctl name="aw882xx_algo_voice_switch" value="On" />
-	<ctl name="aw882xx_spin_relase_time" value="100" />
     </path>
 
     <path name="voicemmode2-call handset">
-        <ctl name="SEC_MI2S_RX_Voice Mixer VoiceMMode2" value="1" />
+        <ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode2" value="1" />
         <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
-        <ctl name="aw882xx_algo_handset_switch" value="On" />
     </path>
 
     <path name="voicemmode2-call headphones">
@@ -2656,7 +2573,7 @@
     </path>
 
     <path name="voicemmode2-call display-port1-and-usb-headset-mic">
-        <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode2" value="1" />
+        <ctl name="DISPLAY_PORT_RX1_Voice Mixer VoiceMMode2" value="1" />
         <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
     </path>
 
@@ -2666,7 +2583,7 @@
     </path>
 
     <path name="voicemmode2-call display-port1">
-        <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode2" value="1" />
+        <ctl name="DISPLAY_PORT_RX1_Voice Mixer VoiceMMode2" value="1" />
         <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
     </path>
 
@@ -2683,12 +2600,10 @@
     <!-- VoIP Rx settings -->
     <path name="audio-playback-voip">
         <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia10" value="1" />
-        <ctl name="aw882xx_algo_voip_switch" value="On" />
-	<ctl name="aw882xx_spin_relase_time" value="100" />
     </path>
 
     <path name="audio-playback-voip handset">
-        <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia10" value="1" />
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="1" />
     </path>
 
     <path name="audio-playback-voip headphones">
@@ -2781,10 +2696,6 @@
         <path name="audio-record-voip bt-sco" />
     </path>
 
-    <path name="audio-record-voip headset-mic">
-        <ctl name="MultiMedia10 Mixer TX_CDC_DMA_TX_4" value="1" />
-    </path>
-
     <path name="deep-buffer-playback bt-a2dp">
         <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="1" />
     </path>
@@ -2955,12 +2866,10 @@
 
     <path name="mmap-playback">
         <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia16" value="1" />
-        <ctl name="aw882xx_algo_music_deepbuffer_switch" value="On" />
-	<ctl name="aw882xx_spin_relase_time" value="100" />
     </path>
 
     <path name="mmap-playback handset">
-        <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia16" value="1" />
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="1" />
     </path>
 
     <path name="mmap-playback headphones">
@@ -3013,7 +2922,7 @@
         <ctl name="DISPLAY_PORT1 Mixer MultiMedia16" value="1" />
     </path>
 
-    <path name="mmap-buffer-playback hdmi">
+    <path name="mmap-playback hdmi">
         <ctl name="HDMI Mixer MultiMedia16" value="1" />
     </path>
 
@@ -3057,7 +2966,7 @@
     </path>
 
     <path name="mmap-record bt-sco">
-      <ctl name="MultiMedia16 Mixer SLIM_7_TX" value="1" />
+      <ctl name="MultiMedia16 Mixer INTERNAL_BT_SCO_TX" value="1" />
     </path>
 
     <path name="mmap-record bt-sco-wb">
@@ -3069,7 +2978,7 @@
     </path>
 
     <path name="mmap-record capture-fm">
-      <ctl name="MultiMedia16 Mixer SLIM_8_TX" value="1" />
+      <ctl name="MultiMedia16 Mixer INTERNAL_FM_TX" value="1" />
     </path>
 
     <path name="mmap-record usb-headset-mic">
@@ -3355,8 +3264,6 @@
     </path>
 
     <path name="spkr-vi-record">
-        <ctl name="aw882xx_rx_switch" value="Enable" />
-        <ctl name="aw882xx_tx_switch" value="Enable" />
         <ctl name="SEC_MI2S_RX_VI_FB_MUX" value="SEC_MI2S_TX" />
     </path>
 
@@ -3393,11 +3300,6 @@
     </path>
 
     <path name="amic4">
-        <ctl name="TX DEC2 MUX" value="SWR_MIC" />
-        <ctl name="TX SMIC MUX2" value="ADC3" />
-        <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
-        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
-        <ctl name="ADC3_MIXER Switch" value="1" />
     </path>
 
     <path name="mic1">
@@ -3451,27 +3353,9 @@
     </path>
 
     <path name="speaker">
-        <ctl name="SEC_MI2S_RX Channels" value="Two" />
-        <ctl name="aw_dev_0_switch" value="Enable" />
-        <ctl name="aw_dev_1_switch" value="Enable" />
-        <ctl name="aw_dev_1_prof" value="Music" />
     </path>
 
     <path name="speaker-mono">
-        <ctl name="SEC_MI2S_RX Channels" value="Two" />
-        <ctl name="aw_dev_0_switch" value="Enable" />
-        <ctl name="aw_dev_1_switch" value="Disable" />
-        <path name="spkr-vi-record" />
-    </path>
-
-    <path name="speaker-left">
-        <ctl name="SEC_MI2S_RX Channels" value="One" />
-        <ctl name="aw_dev_0_switch" value="Disable" />
-        <ctl name="aw_dev_1_switch" value="Enable" />
-    </path>
-
-    <path name="speaker-right">
-        <path name="speaker" />
     </path>
 
     <path name="speaker-mono-2">
@@ -3530,8 +3414,8 @@
 
     <path name="sidetone-handset">
         <path name="sidetone-iir" />
-        <ctl name="IIR0 INP0 Volume" value="54" />
-        <ctl name="IIR0 INP0 MUX" value="DEC2" />
+        <ctl name="IIR0 INP0 Volume" value="40" />
+        <ctl name="IIR0 INP0 MUX" value="DEC1" />
         <ctl name="RX INT0 MIX2 INP" value="SRC0" />
     </path>
 
@@ -3569,9 +3453,13 @@
     </path>
 
     <path name="handset">
-        <ctl name="aw_dev_0_switch" value="Disable" />
-        <ctl name="aw_dev_1_switch" value="Enable" />
-        <ctl name="aw_dev_1_prof" value="Receiver" />
+        <ctl name="RX_MACRO RX0 MUX" value="AIF1_PB" />
+        <ctl name="RX_CDC_DMA_RX_0 Channels" value="One" />
+        <ctl name="RX INT0_1 MIX1 INP0" value="RX0" />
+        <ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />
+        <ctl name="EAR_RDAC Switch" value="1" />
+        <ctl name="RDAC3_MUX" value="RX1" />
+        <ctl name="RX_EAR Mode" value="ON" />
     </path>
 
     <path name="handset-mic">
@@ -3806,7 +3694,6 @@
 
     <path name="dmic-endfire">
         <path name="handset-dmic-endfire" />
-        <ctl name="IIR0 INP0 MUX" value="DEC2" />
     </path>
 
     <path name="handset-stereo-dmic-ef">
@@ -3901,6 +3788,17 @@
         <path name="amic3" />
     </path>
 
+    <path name="three-mic">
+    </path>
+
+    <path name="speaker-tmic">
+        <path name="three-mic" />
+    </path>
+
+    <path name="voice-speaker-tmic">
+        <path name="speaker-tmic" />
+    </path>
+
     <path name="unprocessed-handset-mic">
         <path name="handset-mic" />
     </path>
@@ -3917,31 +3815,6 @@
         <path name="three-mic" />
     </path>
 
-    <path name="three-mic">
-        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />
-        <ctl name="TX DEC1 MUX" value="SWR_MIC" />
-        <ctl name="TX SMIC MUX1" value="ADC2" />
-        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
-        <ctl name="ADC2_MIXER Switch" value="1" />
-        <ctl name="ADC2 MUX" value="INP3" />
-        <ctl name="TX DEC2 MUX" value="SWR_MIC" />
-        <ctl name="TX SMIC MUX2" value="ADC3" />
-        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
-        <ctl name="ADC3_MIXER Switch" value="1" />
-        <ctl name="TX DEC3 MUX" value="SWR_MIC" />
-        <ctl name="TX SMIC MUX3" value="ADC0" />
-        <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
-        <ctl name="ADC1_MIXER Switch" value="1" />
-    </path>
-
-    <path name="speaker-tmic">
-        <path name="three-mic" />
-    </path>
-
-    <path name="voice-speaker-tmic">
-        <path name="speaker-tmic" />
-    </path>
-
     <path name="unprocessed-headset-mic">
         <path name="headset-mic" />
     </path>