From b4f08cfd8e244ea0d8eaafc168810adf37c03c40 Mon Sep 17 00:00:00 2001
From: luka177 <lukapanio@gmail.com>
Date: Fri, 13 Oct 2023 23:34:23 +0200
Subject: [PATCH] pipa: Import audio config from stock

 * From RKQ1.211001.001 V14.0.7.0.TMZCNXM

Change-Id: I0759b23339291abf19e6d6d0c5d93bbbc9b816ce
---
 audio/audio_platform_info_intcodec.xml |  64 ++++-
 audio/mixer_paths.xml                  | 141 ++++++---
 audio/mixer_paths_overlay_dynamic.xml  |   4 +-
 audio/mixer_paths_overlay_static.xml   | 382 +++++++++++++++++--------
 audio/sound_trigger_mixer_paths.xml    |  45 +--
 audio/sound_trigger_platform_info.xml  | 230 ++++-----------
 6 files changed, 502 insertions(+), 364 deletions(-)

diff --git a/audio/audio_platform_info_intcodec.xml b/audio/audio_platform_info_intcodec.xml
index ef2e40b..f4c9665 100644
--- a/audio/audio_platform_info_intcodec.xml
+++ b/audio/audio_platform_info_intcodec.xml
@@ -27,6 +27,8 @@
 <audio_platform_info>
     <bit_width_configs>
         <device name="SND_DEVICE_OUT_SPEAKER" bit_width="24"/>
+        <device name="SND_DEVICE_IN_HANDSET_DMIC_STEREO" bit_width="24"/>
+        <device name="SND_DEVICE_IN_CAMCORDER_DMIC" bit_width="24"/>
     </bit_width_configs>
     <interface_names>
         <device name="AUDIO_DEVICE_IN_BUILTIN_MIC" interface="TX_CDC_DMA_TX_3" codec_type="internal"/>
@@ -38,6 +40,11 @@
             <device name="SND_DEVICE_IN_SPEAKER_TMIC_AEC_NS" module_id="0x10F35" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>
             <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS_BROADSIDE" module_id="0x10F34" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>
             <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS" module_id="0x10F33" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>
+
+            <device name="SND_DEVICE_IN_SPEAKER_TMIC_MODE_MULTI_AEC_NS" module_id="0x10F33" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>
+            <device name="SND_DEVICE_IN_SPEAKER_TMIC_MODE_SINGLE_AEC_NS" module_id="0x10F33" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>
+            <device name="SND_DEVICE_IN_SPEAKER_TMIC_MODE_SURROUND_AEC_NS" module_id="0x10F33" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>
+
             <device name="SND_DEVICE_IN_GAME_SPEAKER_DMIC_AEC_NS" module_id="0x10F33" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>
             <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC_NS" module_id="0x10F31" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>
             <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS" module_id="0x10F33" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>
@@ -51,6 +58,11 @@
             <device name="SND_DEVICE_IN_SPEAKER_TMIC_AEC_NS" module_id="0x10F35" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>
             <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS_BROADSIDE" module_id="0x10F34" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>
             <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS" module_id="0x10F33" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>
+
+            <device name="SND_DEVICE_IN_SPEAKER_TMIC_MODE_MULTI_AEC_NS" module_id="0x10F33" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>
+            <device name="SND_DEVICE_IN_SPEAKER_TMIC_MODE_SINGLE_AEC_NS" module_id="0x10F33" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>
+            <device name="SND_DEVICE_IN_SPEAKER_TMIC_MODE_SURROUND_AEC_NS" module_id="0x10F33" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>
+
             <device name="SND_DEVICE_IN_GAME_SPEAKER_DMIC_AEC_NS" module_id="0x10F33" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>
             <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC_NS" module_id="0x10F31" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>
             <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS" module_id="0x10F33" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>
@@ -81,7 +93,7 @@
         <usecase name="USECASE_AUDIO_PLAYBACK_FM" type="out" id="30"/>
         <usecase name="USECASE_AUDIO_PLAYBACK_FM" type="in" id="32"/>
         <usecase name="USECASE_AUDIO_SPKR_CALIB_RX" type="out" id="30"/>
-        <usecase name="USECASE_AUDIO_SPKR_CALIB_TX" type="in" id="43"/>
+        <usecase name="USECASE_AUDIO_SPKR_CALIB_TX" type="in" id="32"/>
         <usecase name="USECASE_AUDIO_PLAYBACK_AFE_PROXY" type="out" id="5"/>
         <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY" type="in" id="6"/>
         <usecase name="USECASE_AUDIO_RECORD_LOW_LATENCY" type="in" id="13" />
@@ -159,12 +171,14 @@
         <device name="SND_DEVICE_IN_VOICE_RECOG_USB_HEADSET_MIC" acdb_id="44"/>
         <device name="SND_DEVICE_IN_HEADSET_MIC" acdb_id="10008"/>
         <device name="SND_DEVICE_IN_VOICE_REC_HEADSET_MIC" acdb_id="10008"/>
-        <device name="SND_DEVICE_IN_VOICE_REC_DMIC_STEREO" acdb_id="4"/>
+        <device name="SND_DEVICE_IN_VOICE_REC_DMIC_STEREO" acdb_id="11"/>
+        <device name="SND_DEVICE_IN_MAIN_MIC" acdb_id="11"/>
         <device name="SND_DEVICE_IN_VOICE_HEARING_AID" acdb_id="11"/>
-        <device name="SND_DEVICE_IN_VOICE_REC_MIC" acdb_id="10003"/> 
+        <device name="SND_DEVICE_IN_VOICE_REC_MIC" acdb_id="10003"/>
     </acdb_ids>
     <backend_names>
         <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
+        <device name="SND_DEVICE_OUT_HEADPHONES_DOLBY" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_HEADPHONES_HIFI_FILTER" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_HEADPHONES_44_1" backend="headphones-44.1" interface="RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_GAME_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
@@ -191,6 +205,12 @@
         <device name="SND_DEVICE_OUT_GAME_SPEAKER" backend="speaker" interface="TERT_TDM_RX_0"/>
         <device name="SND_DEVICE_OUT_SPEAKER_MONO" backend="speaker" interface="TERT_TDM_RX_0"/>
         <device name="SND_DEVICE_OUT_SPEAKER_MONO_2" backend="speaker" interface="TERT_TDM_RX_0"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_TR" backend="speaker" interface="TERT_TDM_RX_0"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_TL" backend="speaker" interface="TERT_TDM_RX_0"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_BR" backend="speaker" interface="TERT_TDM_RX_0"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_BL" backend="speaker" interface="TERT_TDM_RX_0"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_DOLBY_3D" backend="speaker" interface="TERT_TDM_RX_0"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_3D" backend="speaker" interface="TERT_TDM_RX_0"/>
         <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_1" backend="speaker" interface="TERT_TDM_RX_0"/>
         <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_2" backend="speaker" interface="TERT_TDM_RX_0"/>
         <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" backend="speaker" interface="TERT_TDM_RX_0"/>
@@ -253,6 +273,11 @@
         <device name="SND_DEVICE_IN_SPEAKER_DMIC_NS" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_SPEAKER_DMIC_NS_SB" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS" interface="TX_CDC_DMA_TX_3"/>
+
+        <device name="SND_DEVICE_IN_SPEAKER_TMIC_MODE_MULTI_AEC_NS" interface="TX_CDC_DMA_TX_3"/>
+        <device name="SND_DEVICE_IN_SPEAKER_TMIC_MODE_SINGLE_AEC_NS" interface="TX_CDC_DMA_TX_3"/>
+        <device name="SND_DEVICE_IN_SPEAKER_TMIC_MODE_SURROUND_AEC_NS" interface="TX_CDC_DMA_TX_3"/>
+
         <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS_SB" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_SB" interface="TX_CDC_DMA_TX_3"/>
@@ -277,7 +302,7 @@
         <device name="SND_DEVICE_IN_HANDSET_STEREO_DMIC" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_HANDSET_DMIC_STEREO" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_SPEAKER_STEREO_DMIC" interface="TX_CDC_DMA_TX_3"/>
-        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK" interface="WSA_CDC_DMA_TX_0"/>
+        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK" interface="TERT_TDM_TX_0"/>
         <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK_MONO_1" interface="WSA_CDC_DMA_TX_0"/>
         <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK_MONO_2" interface="WSA_CDC_DMA_TX_0"/>
         <device name="SND_DEVICE_IN_VOICE_SPEAKER_DMIC_BROADSIDE" interface="TX_CDC_DMA_TX_3"/>
@@ -305,10 +330,13 @@
         <device name="SND_DEVICE_IN_UNPROCESSED_QUAD_MIC" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_HEADSET_MIC" interface="TX_CDC_DMA_TX_3"/>
+        <device name="SND_DEVICE_IN_HEADSET_MIC_FLUENCE" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_VOICE_REC_HEADSET_MIC" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_MAIN_MIC" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_TOP_MIC" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_BACK_MIC" interface="TX_CDC_DMA_TX_3"/>
+        <device name="SND_DEVICE_IN_SIDETOP_MIC" interface="TX_CDC_DMA_TX_3"/>
+        <device name="SND_DEVICE_IN_SIDEBOTTOM_MIC" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES" backend="speaker-and-headphones" interface="TERT_TDM_RX_0-and-RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET" backend="speaker-and-headphones" interface="TERT_TDM_RX_0-and-RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO" backend="speaker-and-bt-sco" interface="TERT_TDM_RX_0-and-SLIMBUS_7_RX"/>
@@ -421,6 +449,34 @@
                         <mic_info mic_device_id="builtin_mic_3"
                             channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
                     </snd_dev>
+
+                    <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_TMIC_MODE_MULTI_AEC_NS">
+                        <mic_info mic_device_id="builtin_mic_1"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                        <mic_info mic_device_id="builtin_mic_2"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                        <mic_info mic_device_id="builtin_mic_3"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                    </snd_dev>
+
+                    <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_TMIC_MODE_SINGLE_AEC_NS">
+                        <mic_info mic_device_id="builtin_mic_1"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                        <mic_info mic_device_id="builtin_mic_2"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                        <mic_info mic_device_id="builtin_mic_3"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                    </snd_dev>
+
+                    <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_TMIC_MODE_SURROUND_AEC_NS">
+                        <mic_info mic_device_id="builtin_mic_1"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                        <mic_info mic_device_id="builtin_mic_2"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                        <mic_info mic_device_id="builtin_mic_3"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                    </snd_dev>
+
                     <snd_dev in_snd_device="SND_DEVICE_IN_GAME_SPEAKER_DMIC_AEC_NS">
                         <mic_info mic_device_id="builtin_mic_1"
                             channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
diff --git a/audio/mixer_paths.xml b/audio/mixer_paths.xml
index e5e4efa..df54527 100644
--- a/audio/mixer_paths.xml
+++ b/audio/mixer_paths.xml
@@ -225,9 +225,6 @@
     <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" />
-    <!-- Multimode Voice1 proxy-Port -->
-    <ctl name="PROXY_RX_Voice Mixer VoiceMMode1" value="0" />
-    <ctl name="VoiceMMode1_Tx Mixer PROXY_TX_MMode1" value="0" />
     <!-- Miltimode Voice1 end-->
 
     <!-- Multimode Voice2 -->
@@ -247,9 +244,6 @@
     <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" />
-    <!-- Multimode Voice2 proxy-Port -->
-    <ctl name="PROXY_RX_Voice Mixer VoiceMMode2" value="0" />
-    <ctl name="VoiceMMode2_Tx Mixer PROXY_TX_MMode2" value="0" />
     <!-- Multimode Voice2 end-->
 
     <!-- Voice external ec. reference -->
@@ -643,6 +637,10 @@
         <path name="echo-reference bt-sco" />
     </path>
 
+    <path name="echo-reference bt-a2dp">
+        <path name="echo-reference bt-sco" />
+    </path>
+
     <path name="echo-reference-voip">
         <ctl name="EC Reference Channels" value="One"/>
         <ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_0" />
@@ -706,6 +704,10 @@
         <path name="echo-reference-voip bt-sco" />
     </path>
 
+    <path name="echo-reference-voip bt-a2dp">
+        <path name="echo-reference-voip bt-sco" />
+    </path>
+
     <path name="deep-buffer-playback">
         <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="1" />
     </path>
@@ -2073,10 +2075,6 @@
         <path name="incall-rec-uplink" />
     </path>
 
-    <path name="incall-rec-uplink call-proxy-in">
-        <path name="incall-rec-uplink" />
-    </path>
-
     <path name="incall-rec-uplink-compress">
         <ctl name="MultiMedia8 Mixer VOC_REC_UL" value="1" />
     </path>
@@ -2129,10 +2127,6 @@
         <path name="incall-rec-downlink" />
     </path>
 
-    <path name="incall-rec-downlink call-proxy-in">
-        <path name="incall-rec-downlink" />
-    </path>
-
     <path name="incall-rec-downlink headset-mic">
         <path name="incall-rec-downlink" />
     </path>
@@ -2190,10 +2184,6 @@
         <path name="incall-rec-uplink-and-downlink" />
     </path>
 
-    <path name="incall-rec-uplink-and-downlink call-proxy-in">
-        <path name="incall-rec-uplink-and-downlink" />
-    </path>
-
     <path name="incall-rec-uplink-and-downlink headset-mic">
         <path name="incall-rec-uplink-and-downlink" />
     </path>
@@ -2309,11 +2299,6 @@
         <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />
     </path>
 
-    <path name="voicemmode1-call call-proxy">
-        <ctl name="PROXY_RX_Voice Mixer VoiceMMode1" value="1" />
-        <ctl name="VoiceMMode1_Tx Mixer PROXY_TX_MMode1" value="1" />
-    </path>
-
     <path name="voicemmode1-call headphones">
         <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" />
@@ -2461,11 +2446,6 @@
         <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
     </path>
 
-    <path name="voicemmode2-call call-proxy">
-        <ctl name="PROXY_RX_Voice Mixer VoiceMMode2" value="1" />
-        <ctl name="VoiceMMode2_Tx Mixer PROXY_TX_MMode2" value="1" />
-    </path>
-
     <!-- VoIP Rx settings -->
     <path name="audio-playback-voip">
         <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="1" />
@@ -2779,6 +2759,27 @@
         <ctl name="ADC2 Volume" value="20" />
     </path>
 
+    <path name="sidetop-mic">
+        <ctl name="TX DEC0 MUX" value="SWR_MIC"/>
+        <ctl name="TX SMIC MUX0" value="ADC3" />
+        <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
+        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
+        <ctl name="ADC4_MIXER Switch" value="1" />
+        <ctl name="ADC4 MUX" value="INP5" />
+        <ctl name="ADC4 Volume" value="20" />
+    </path>
+
+    <path name="sidebottom-mic">
+        <ctl name="TX DEC0 MUX" value="SWR_MIC"/>
+        <ctl name="TX SMIC MUX0" value="ADC1" />
+        <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
+        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
+        <ctl name="ADC2_MIXER Switch" value="1" />
+        <ctl name="ADC2 MUX" value="INP3" />
+        <ctl name="HDR12 MUX" value="NO_HDR12" />
+        <ctl name="ADC2 Volume" value="20" />
+    </path>
+
     <path name="va-enroll-mic">
         <ctl name="TX DEC0 MUX" value="SWR_MIC"/>
         <ctl name="TX SMIC MUX0" value="ADC3" />
@@ -3509,6 +3510,80 @@
         <ctl name="TX DMIC MUX3" value="DMIC2" />
     </path>
 
+    <path name="speaker-tmic-multi">
+        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />
+        <ctl name="TX DEC0 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX0" value="ADC0" />
+        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
+        <ctl name="ADC1_MIXER Switch" value="1" />
+        <ctl name="ADC1 Volume" value="6" />
+
+        <ctl name="TX DEC1 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX1" value="ADC3" />
+        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
+        <ctl name="ADC4_MIXER Switch" value="1" />
+        <ctl name="ADC4 MUX" value="INP5" />
+        <ctl name="ADC4 Volume" value="6" />
+
+        <ctl name="TX DEC2 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX2" value="ADC1" />
+        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+        <ctl name="ADC2_MIXER Switch" value="1" />
+        <ctl name="ADC2 MUX" value="INP3" />
+        <ctl name="HDR12 MUX" value="NO_HDR12" />
+        <ctl name="ADC2 Volume" value="6" />
+    </path>
+
+    <path name="speaker-tmic-single">
+        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />
+        <ctl name="TX DEC0 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX0" value="ADC3" />
+        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
+        <ctl name="ADC4_MIXER Switch" value="1" />
+        <ctl name="ADC4 MUX" value="INP5" />
+        <ctl name="ADC4 Volume" value="6" />
+
+        <ctl name="TX DEC1 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX1" value="ADC1" />
+        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
+        <ctl name="ADC2_MIXER Switch" value="1" />
+        <ctl name="ADC2 MUX" value="INP3" />
+        <ctl name="HDR12 MUX" value="NO_HDR12" />
+        <ctl name="ADC2 Volume" value="6" />
+
+        <ctl name="TX DEC2 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX2" value="ADC2" />
+        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+        <ctl name="ADC3_MIXER Switch" value="1" />
+        <ctl name="ADC3 MUX" value="INP4" />
+        <ctl name="HDR34 MUX" value="NO_HDR34" />
+        <ctl name="ADC3 Volume" value="6" />
+    </path>
+
+    <path name="speaker-tmic-surround">
+        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />
+        <ctl name="TX DEC0 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX0" value="ADC0" />
+        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
+        <ctl name="ADC1_MIXER Switch" value="1" />
+        <ctl name="ADC1 Volume" value="6" />
+
+        <ctl name="TX DEC1 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX1" value="ADC3" />
+        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
+        <ctl name="ADC4_MIXER Switch" value="1" />
+        <ctl name="ADC4 MUX" value="INP5" />
+        <ctl name="ADC4 Volume" value="6" />
+
+        <ctl name="TX DEC2 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX2" value="ADC1" />
+        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+        <ctl name="ADC2_MIXER Switch" value="1" />
+        <ctl name="ADC2 MUX" value="INP3" />
+        <ctl name="HDR12 MUX" value="NO_HDR12" />
+        <ctl name="ADC2 Volume" value="6" />
+    </path>
+
     <path name="speaker-tmic">
         <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />
         <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
@@ -4044,10 +4119,6 @@
         <path name="incall_music_uplink" />
     </path>
 
-    <path name="incall_music_uplink call-proxy">
-        <path name="incall_music_uplink" />
-    </path>
-
     <path name="incall_music_uplink usb-headphones">
         <path name="incall_music_uplink" />
     </path>
@@ -4175,10 +4246,4 @@
     <path name="incall_music_uplink2 bt-a2dp">
         <path name="incall_music_uplink2" />
     </path>
-
-    <path name="call-proxy">
-    </path>
-
-    <path name="call-proxy-in">
-    </path>
 </mixer>
diff --git a/audio/mixer_paths_overlay_dynamic.xml b/audio/mixer_paths_overlay_dynamic.xml
index c3810a8..35d20dd 100644
--- a/audio/mixer_paths_overlay_dynamic.xml
+++ b/audio/mixer_paths_overlay_dynamic.xml
@@ -35,8 +35,8 @@
         <ctl name="COMP2 Switch" value="0" />
         <ctl name="HPHL Volume" value="20" />
         <ctl name="HPHR Volume" value="20" />
-        <ctl name="RX_RX0 Digital Volume" value="72" />
-        <ctl name="RX_RX1 Digital Volume" value="72" />
+        <ctl name="RX_RX0 Digital Volume" value="84" />
+        <ctl name="RX_RX1 Digital Volume" value="84" />
     </path>
 
     <path name="voice-headphones">
diff --git a/audio/mixer_paths_overlay_static.xml b/audio/mixer_paths_overlay_static.xml
index edf0b0b..836cca6 100644
--- a/audio/mixer_paths_overlay_static.xml
+++ b/audio/mixer_paths_overlay_static.xml
@@ -23,59 +23,35 @@
     <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia15" value="0" />
     <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia16" value="0" />
     <ctl name="TERT_TDM_RX_0_Voice Mixer Voip" value="0" />
+    <ctl name="ADC1_MIXER Switch" value="1" />
+    <ctl name="ADC4_MIXER Switch" value="1" />
+    <ctl name="ADC4 MUX" value="INP5" />
     <ctl name="ADC1 Volume" value="8" />
     <ctl name="ADC2 Volume" value="8" />
     <ctl name="ADC3 Volume" value="8" />
     <ctl name="ADC4 Volume" value="8" />
-    <ctl name="TERT_TDM_RX_0 Channels" value="Two" />
-    <ctl name="TERT_TDM_RX_0 Format" value="S24_LE" />
-    <ctl name="TERT_TDM_RX_0 SampleRate" value="KHZ_96" />
-    <ctl name="TERT_TDM_TX_0 Channels" value="Two" />
-    <ctl name="TERT_TDM_TX_0 Format" value="S24_LE" />
-    <ctl name="TERT_TDM_TX_0 SampleRate" value="KHZ_96" />
-    <ctl name="TERT_TDM_RX_1 Channels" value="One" />
-    <ctl name="TERT_TDM_RX_1 Format" value="S24_LE" />
-    <ctl name="TERT_TDM_RX_1 SampleRate" value="KHZ_96" />
+    <ctl name="TERT_TDM_RX_0 Channels" value="Four" />
+    <ctl name="TERT_TDM_RX_0 Format" value="S32_LE" />
+    <ctl name="TERT_TDM_RX_0 SampleRate" value="KHZ_48" />
+    <ctl name="TERT_TDM_RX_VI_FB_MUX" value="ZERO" />
+    <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+    <ctl name="TERT_TDM_TX_0 Format" value="S32_LE" />
+    <ctl name="TERT_TDM_TX_0 SampleRate" value="KHZ_48" />
     <ctl name="USB_AUDIO_RX Format" value="S24_LE" />
-    <!-- smart PA begin -->
-    <!-- left smart PA -->
-    <ctl name="DSP1 Firmware" value="Protection" />
-    <ctl name="DSP1 Preload Switch" value="1" />
-    <ctl name="DRE DRE Switch" value="1" />
-    <ctl name="PCM Source" value="None" />
-    <ctl name="PCM Soft Ramp" value="4ms" />
-    <ctl name="AMP PCM Gain" value="18" />
-    <ctl name="DSP Block Bypass" value="Off" />
-    <ctl name="ASP TX1 Source" value="Zero" />
-    <ctl name="ASP TX2 Source" value="Zero" />
-    <ctl name="DSP RX1 Source" value="Zero" />
-    <ctl name="DSP RX2 Source" value="Zero" />
-    <ctl name="ASPTX Ref" value="None" />
-    <ctl name="ASPRX1 Slot Position" value="1" />
-    <ctl name="ASPRX2 Slot Position" value="4" />
-    <ctl name="Fast Use Case Delta File" value="spk1_playback_delta.txt"/>
-    <ctl name="Fast Use Case Switch Enable" value="1"/>
-    <ctl name="Boost Class-H Tracking Enable" value="1" />
-    <ctl name="Boost Target Voltage" value="0" />
-     <!-- right smart PA -->
-    <ctl name="RCV DSP1 Firmware" value="Protection" />
-    <ctl name="RCV DSP1 Preload Switch" value="1" />
-    <ctl name="RCV DRE DRE Switch" value="1" />
-    <ctl name="RCV PCM Source" value="None" />
-    <ctl name="RCV PCM Soft Ramp" value="4ms" />
-    <ctl name="RCV AMP PCM Gain" value="18" />
-    <ctl name="RCV DSP Block Bypass" value="Off" />
-    <ctl name="RCV ASP TX1 Source" value="Zero" />
-    <ctl name="RCV ASP TX2 Source" value="Zero" />
-    <ctl name="RCV DSP RX1 Source" value="Zero" />
-    <ctl name="RCV DSP RX2 Source" value="Zero" />
-    <ctl name="RCV ASPTX Ref" value="None" />
-    <ctl name="RCV ASPRX1 Slot Position" value="0" />
-    <ctl name="RCV ASPRX2 Slot Position" value="2" />
-    <ctl name="RCV Fast Use Case Delta File" value="spk2_playback_delta.txt"/>
-    <ctl name="RCV Fast Use Case Switch Enable" value="1"/>
-    <ctl name="RCV Boost Class-H Tracking Enable" value="1" />
-    <ctl name="RCV Boost Target Voltage" value="0" />
+    <!-- smart PA -->
+    <ctl name="aw882xx_rx_switch" value="Disable" />
+    <ctl name="aw882xx_tx_switch" value="Disable" />
+    <ctl name="aw882xx_copp_switch" value="Disable" />
+    <ctl name="aw_dev_0_prof" value="Music" />
+    <ctl name="aw_dev_0_switch" value="Disable" />
+    <ctl name="aw_dev_1_prof" value="Music" />
+    <ctl name="aw_dev_1_switch" value="Disable" />
+    <ctl name="aw_dev_2_prof" value="Music" />
+    <ctl name="aw_dev_2_switch" value="Disable" />
+    <ctl name="aw_dev_3_prof" value="Music" />
+    <ctl name="aw_dev_3_switch" value="Disable" />
+    <!-- channel reverse in pa -->
+    <ctl name="aw882xx_spin_switch" value="spin_0" />
     <!-- smart PA end -->
     <ctl name="COMP1 Switch" value="0" />
     <ctl name="COMP2 Switch" value="0" />
@@ -760,12 +736,12 @@
 
     <path name="echo-reference-voip speaker">
         <ctl name="EC Reference Channels" value="Two"/>
-        <ctl name="AUDIO_REF_EC_UL10 MUX" value="TERT_TDM_TX_0" />
+        <ctl name="AUDIO_REF_EC_UL10 MUX" value="TERT_TDM_RX_0" />
     </path>
 
     <path name="echo-reference speaker">
         <ctl name="EC Reference Channels" value="Two"/>
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="TERT_TDM_TX_0" />
+        <ctl name="AUDIO_REF_EC_UL1 MUX" value="TERT_TDM_RX_0" />
     </path>
 
     <path name="echo-reference-voip earpiece">
@@ -801,20 +777,20 @@
 
     <path name="ultrasound-proximity-output speaker">
         <ctl name="Mi_Ultrasound Rx Device" value="1"/>
-        <ctl name="TERT_TDM_RX_1 SampleRate" value="KHZ_96" />
+        <!--<ctl name="TERT_TDM_RX_1 SampleRate" value="KHZ_48" />
         <ctl name="TERT_TDM_RX_1 Channels" value="One" />
-        <ctl name="TERT_TDM_RX_1 Format" value="S24_LE" />
+        <ctl name="TERT_TDM_RX_1 Format" value="S24_LE" />-->
     </path>
 
     <path name="ultrasound-proximity-output speaker-and-headphones">
-        <ctl name="TERT_TDM_RX_1 SampleRate" value="KHZ_96" />
+        <!--<ctl name="TERT_TDM_RX_1 SampleRate" value="KHZ_48" />
         <ctl name="TERT_TDM_RX_1 Channels" value="One" />
-        <ctl name="TERT_TDM_RX_1 Format" value="S24_LE" />
+        <ctl name="TERT_TDM_RX_1 Format" value="S24_LE" />-->
     </path>
 
 
     <path name="ultrasound-output">
-        <ctl name="TERT_TDM_RX_1 SampleRate" value="KHZ_96" />
+        <ctl name="TERT_TDM_RX_1 SampleRate" value="KHZ_48" />
         <ctl name="TERT_TDM_RX_1 Channels" value="One" />
         <ctl name="TERT_TDM_RX_1 Format" value="S24_LE" />
         <ctl name="RCV PCM Source" value="DSP" />
@@ -859,7 +835,7 @@
     </path>
 
     <path name="ultrasound-suspend">
-        <ctl name="Mi_Ultrasound Suspend" value="1"/>
+        <ctl name="Mi_Ultrasound Suspend" value="1"/>>
     </path>
 
     <path name="ultrasound-stop-report">
@@ -868,7 +844,7 @@
 
     <path name="ultrasound-input">
         <ctl name="TX_CDC_DMA_TX_4 Channels" value="One" />
-        <ctl name="TX_CDC_DMA_TX_4 SampleRate" value="KHZ_96" />
+        <ctl name="TX_CDC_DMA_TX_4 SampleRate" value="KHZ_48" />
         <ctl name="TX DEC2 MUX" value="SWR_MIC" />
         <ctl name="TX SMIC MUX2" value="ADC2" />
         <ctl name="HDR34 MUX" value="HDR34" />
@@ -878,53 +854,57 @@
     </path>
 
     <path name="speaker">
-       <ctl name="TERT_TDM_RX_0 Channels" value="Two" />
-       <ctl name="TERT_TDM_RX_0 Format" value="S24_LE" />
-       <ctl name="TERT_TDM_RX_0 SampleRate" value="KHZ_96" />
-       <ctl name="PCM Source" value="DSP" />
-       <ctl name="RCV PCM Source" value="DSP" />
-       <ctl name="ASP TX2 Source" value="DSPTX1" />
-       <ctl name="DSP RX1 Source" value="ASPRX1" />
-       <ctl name="DSP RX2 Source" value="ASPRX1" />
-       <ctl name="ASPRX1 Slot Position" value="1" />
-       <ctl name="ASPTX Ref" value="Ref" />
-       <ctl name="RCV DSP RX1 Source" value="ASPRX1" />
-       <ctl name="RCV DSP RX2 Source" value="ASPRX2" />
-       <ctl name="RCV ASP TX1 Source" value="DSPTX1" />
-       <ctl name="RCV ASPRX1 Slot Position" value="0" />
-       <ctl name="RCV ASPRX2 Slot Position" value="2" />
-       <ctl name="RCV ASPTX Ref" value="Ref" />
-       <ctl name="Cirrus SP Usecase Config" value="None" />
-       <ctl name="Mi_Ultrasound Rx Device" value="1"/>
+        <ctl name="TERT_TDM_RX_0 Channels" value="Four" />
+        <ctl name="TERT_TDM_RX_0 Format" value="S32_LE" />
+        <ctl name="TERT_TDM_RX_0 SampleRate" value="KHZ_48" />
+        <ctl name="aw_dev_0_switch" value="Enable" />
+        <ctl name="aw_dev_1_switch" value="Enable" />
+        <ctl name="aw_dev_2_switch" value="Enable" />
+        <ctl name="aw_dev_3_switch" value="Enable" />
+    </path>
+
+    <path name="speaker-tl">
+        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />
+        <ctl name="TERT_TDM_RX_0 Format" value="S32_LE" />
+        <ctl name="TERT_TDM_RX_0 SampleRate" value="KHZ_48" />
+        <ctl name="aw_dev_0_prof" value="Mmi" />
+        <ctl name="aw_dev_0_switch" value="Enable" />
+    </path>
+
+    <path name="speaker-tr">
+        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />
+        <ctl name="TERT_TDM_RX_0 Format" value="S32_LE" />
+        <ctl name="TERT_TDM_RX_0 SampleRate" value="KHZ_48" />
+        <ctl name="aw_dev_3_prof" value="Mmi" />
+        <ctl name="aw_dev_3_switch" value="Enable" />
+    </path>
+
+    <path name="speaker-br">
+        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />
+        <ctl name="TERT_TDM_RX_0 Format" value="S32_LE" />
+        <ctl name="TERT_TDM_RX_0 SampleRate" value="KHZ_48" />
+        <ctl name="aw_dev_1_prof" value="Mmi" />
+        <ctl name="aw_dev_1_switch" value="Enable" />
+    </path>
+
+    <path name="speaker-bl">
+        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />
+        <ctl name="TERT_TDM_RX_0 Format" value="S32_LE" />
+        <ctl name="TERT_TDM_RX_0 SampleRate" value="KHZ_48" />
+        <ctl name="aw_dev_2_prof" value="Mmi" />
+        <ctl name="aw_dev_2_switch" value="Enable" />
     </path>
 
     <path name="speaker-mono">
-       <ctl name="TERT_TDM_RX_0 Channels" value="Two" />
-       <ctl name="TERT_TDM_RX_0 Format" value="S24_LE" />
-       <ctl name="TERT_TDM_RX_0 SampleRate" value="KHZ_96" />
-       <ctl name="ASP TX1 Source" value="DSPTX1" />
-       <ctl name="ASP TX2 Source" value="DSPTX1" />
-       <ctl name="DSP RX1 Source" value="ASPRX1" />
-       <ctl name="DSP RX2 Source" value="ASPRX1" />
-       <ctl name="ASPRX1 Slot Position" value="1" />
-       <ctl name="RCV PCM Source" value="None" />
-       <ctl name="PCM Source" value="DSP" />
-       <ctl name="ASPTX Ref" value="Ref" />
+        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />
+        <ctl name="TERT_TDM_RX_0 Format" value="S32_LE" />
+        <ctl name="TERT_TDM_RX_0 SampleRate" value="KHZ_48" />
     </path>
 
     <path name="speaker-mono-2">
-       <ctl name="TERT_TDM_RX_0 Channels" value="Two" />
-       <ctl name="TERT_TDM_RX_0 Format" value="S24_LE" />
-       <ctl name="TERT_TDM_RX_0 SampleRate" value="KHZ_96" />
-       <ctl name="RCV DSP RX1 Source" value="ASPRX1" />
-       <ctl name="RCV DSP RX2 Source" value="ASPRX2" />
-       <ctl name="RCV ASP TX1 Source" value="DSPTX1" />
-       <ctl name="RCV ASP TX2 Source" value="DSPTX1" />
-       <ctl name="RCV ASPRX1 Slot Position" value="0" />
-       <ctl name="RCV ASPRX2 Slot Position" value="2" />
-       <ctl name="PCM Source" value="None" />
-       <ctl name="RCV PCM Source" value="DSP" />
-       <ctl name="RCV ASPTX Ref" value="Ref" />
+        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />
+        <ctl name="TERT_TDM_RX_0 Format" value="S32_LE" />
+        <ctl name="TERT_TDM_RX_0 SampleRate" value="KHZ_48" />
     </path>
 
     <path name="speaker-protected">
@@ -933,29 +913,76 @@
 
     <path name="voice-speaker-protected">
         <path name="speaker" />
+        <!--<ctl name="BL Fast Use Case Delta File" value="BL-voice.txt"/>
+        <ctl name="BR Fast Use Case Delta File" value="BR-voice.txt"/>
+        <ctl name="TL Fast Use Case Delta File" value="TL-voice.txt"/>
+        <ctl name="TR Fast Use Case Delta File" value="TR-voice.txt"/>-->
     </path>
 
     <path name="voice-speaker">
         <path name="speaker" />
+        <!--<ctl name="BL Fast Use Case Delta File" value="BL-voice.txt"/>
+        <ctl name="BR Fast Use Case Delta File" value="BR-voice.txt"/>
+        <ctl name="TL Fast Use Case Delta File" value="TL-voice.txt"/>
+        <ctl name="TR Fast Use Case Delta File" value="TR-voice.txt"/>-->
     </path>
 
     <path name="voice-speaker-stereo">
         <path name="speaker" />
-        <ctl name="Fast Use Case Delta File" value="spk1_voice_delta.txt"/>
-        <ctl name="RCV Fast Use Case Delta File" value="spk2_voice_delta.txt"/>
+        <!--<ctl name="TERT_TDM_RX_0 Channels" value="Two" />
+        <ctl name="TERT_TDM_RX_0 Format" value="S32_LE" />
+        <ctl name="TERT_TDM_RX_0 SampleRate" value="KHZ_48" />
+        <ctl name="TL PCM Source" value="DSP" />
+        <ctl name="TL ASPTX Ref" value="Ref" />
+        <ctl name="TR PCM Source" value="DSP" />
+        <ctl name="TR ASPTX Ref" value="Ref" />
+        <ctl name="BR PCM Source" value="DSP" />
+        <ctl name="BR ASPTX Ref" value="Ref" />
+        <ctl name="BL PCM Source" value="DSP" />
+        <ctl name="BL ASPTX Ref" value="Ref" />
+        <ctl name="BL Fast Use Case Delta File" value="BL-voice.txt"/>
+        <ctl name="BR Fast Use Case Delta File" value="BR-voice.txt"/>
+        <ctl name="TL Fast Use Case Delta File" value="TL-voice.txt"/>
+        <ctl name="TR Fast Use Case Delta File" value="TR-voice.txt"/>-->
     </path>
 
     <path name="voice-speaker-2">
-        <path name="speaker-mono-2" />
+        <path name="speaker" />
+        <!--<ctl name="BL Fast Use Case Delta File" value="BL-voice.txt"/>
+        <ctl name="BR Fast Use Case Delta File" value="BR-voice.txt"/>
+        <ctl name="TL Fast Use Case Delta File" value="TL-voice.txt"/>
+        <ctl name="TR Fast Use Case Delta File" value="TR-voice.txt"/>-->
+    </path>
+
+    <path name="four-channel-speaker">
+        <ctl name="TERT_TDM_RX_0 Channels" value="Four" />
+        <ctl name="TERT_TDM_RX_0 Format" value="S32_LE" />
+        <ctl name="TR ASPTX Ref" value="Ref" />
+        <ctl name="TL ASPTX Ref" value="Ref" />
+        <ctl name="BR ASPTX Ref" value="Ref" />
+        <ctl name="BL ASPTX Ref" value="Ref" />
+        <ctl name="TR PCM Source" value="DSP" />
+        <ctl name="TL PCM Source" value="DSP" />
+        <ctl name="BR PCM Source" value="DSP" />
+        <ctl name="BL PCM Source" value="DSP" />
+        <ctl name="TR ASPRX1 Slot Position" value="0" />
+        <ctl name="TR ASPRX2 Slot Position" value="4" />
+        <ctl name="BR ASPRX1 Slot Position" value="1" />
+        <ctl name="BR ASPRX2 Slot Position" value="5" />
+        <ctl name="TL ASPRX1 Slot Position" value="2" />
+        <ctl name="TL ASPRX2 Slot Position" value="6" />
+        <ctl name="BL ASPRX1 Slot Position" value="3" />
+        <ctl name="BL ASPRX2 Slot Position" value="7" />
+        <ctl name="TR Channel Swap" value="Off" />
+        <ctl name="TL Channel Swap" value="Off" />
+        <ctl name="BR Channel Swap" value="Off" />
+        <ctl name="BL Channel Swap" value="Off" />
     </path>
 
     <path name="handset">
         <ctl name="TERT_TDM_RX_0 Channels" value="Two" />
-        <ctl name="TERT_TDM_RX_0 Format" value="S24_LE" />
-        <ctl name="TERT_TDM_RX_0 SampleRate" value="KHZ_96" />
-        <ctl name="TERT_TDM_RX_1 SampleRate" value="KHZ_96" />
-        <ctl name="TERT_TDM_RX_1 Channels" value="One" />
-        <ctl name="TERT_TDM_RX_1 Format" value="S24_LE" />
+        <ctl name="TERT_TDM_RX_0 Format" value="S32_LE" />
+        <ctl name="TERT_TDM_RX_0 SampleRate" value="KHZ_48" />
         <ctl name="RCV DSP RX1 Source" value="ASPRX1" />
         <ctl name="RCV DSP RX2 Source" value="ASPRX2" />
         <ctl name="RCV ASP TX1 Source" value="DSPTX1" />
@@ -972,28 +999,17 @@
     </path>
 
     <path name="handset-mic">
-        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two" />
-        <ctl name="TX DEC1 MUX" value="SWR_MIC"/>
-        <ctl name="TX SMIC MUX1" value="ADC0" />
-        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
-        <ctl name="ADC1_MIXER Switch" value="1" />
-        <ctl name="ADC1 Volume" value="6" />
-        <ctl name="TX DEC0 MUX" value="SWR_MIC"/>
-        <ctl name="TX SMIC MUX0" value="ADC3" />
-        <ctl name="ADC4_MIXER Switch" value="1" />
-        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
-        <ctl name="ADC4 MUX" value="INP5" />
-        <ctl name="ADC4 Volume" value="6" />
+        <path name="handset-dmic-dual-adc" />
     </path>
 
-    <path name="voice-rec-mic">
+    <path name="va-enroll-mic">
         <ctl name="TX DEC0 MUX" value="SWR_MIC"/>
         <ctl name="TX SMIC MUX0" value="ADC0" />
         <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
         <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
         <ctl name="ADC1_MIXER Switch" value="1" />
         <ctl name="ADC1 Volume" value="8" />
-        <ctl name="TX_DEC0 Volume" value="88" />
+        <ctl name="TX_DEC0 Volume" value="87" />
     </path>
 
     <path name="speaker-mic">
@@ -1080,4 +1096,130 @@
     <path name="camcorder-dmic">
         <path name="handset-dmic-dual-adc" />
     </path>
+
+    <path name="speaker-tmic-multi">
+        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />
+        <ctl name="TX DEC0 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX0" value="ADC0" />
+        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
+        <ctl name="ADC1_MIXER Switch" value="1" />
+        <ctl name="ADC1 Volume" value="8" />
+
+        <ctl name="TX DEC1 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX1" value="ADC3" />
+        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
+        <ctl name="ADC4_MIXER Switch" value="1" />
+        <ctl name="ADC4 MUX" value="INP5" />
+        <ctl name="ADC4 Volume" value="8" />
+
+        <ctl name="TX DEC2 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX2" value="ADC1" />
+        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+        <ctl name="ADC2_MIXER Switch" value="1" />
+        <ctl name="ADC2 MUX" value="INP3" />
+        <ctl name="HDR12 MUX" value="NO_HDR12" />
+        <ctl name="ADC2 Volume" value="8" />
+    </path>
+
+    <path name="speaker-tmic-single">
+        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />
+        <ctl name="TX DEC0 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX0" value="ADC3" />
+        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
+        <ctl name="ADC4_MIXER Switch" value="1" />
+        <ctl name="ADC4 MUX" value="INP5" />
+        <ctl name="ADC4 Volume" value="8" />
+
+        <ctl name="TX DEC1 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX1" value="ADC1" />
+        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
+        <ctl name="ADC2_MIXER Switch" value="1" />
+        <ctl name="ADC2 MUX" value="INP3" />
+        <ctl name="HDR12 MUX" value="NO_HDR12" />
+        <ctl name="ADC2 Volume" value="8" />
+
+        <ctl name="TX DEC2 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX2" value="ADC2" />
+        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+        <ctl name="ADC3_MIXER Switch" value="1" />
+        <ctl name="ADC3 MUX" value="INP4" />
+        <ctl name="HDR34 MUX" value="NO_HDR34" />
+        <ctl name="ADC3 Volume" value="8" />
+    </path>
+
+    <path name="speaker-tmic-surround">
+        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />
+        <ctl name="TX DEC0 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX0" value="ADC0" />
+        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
+        <ctl name="ADC1_MIXER Switch" value="1" />
+        <ctl name="ADC1 Volume" value="8" />
+
+        <ctl name="TX DEC1 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX1" value="ADC3" />
+        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
+        <ctl name="ADC4_MIXER Switch" value="1" />
+        <ctl name="ADC4 MUX" value="INP5" />
+        <ctl name="ADC4 Volume" value="8" />
+
+        <ctl name="TX DEC2 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX2" value="ADC1" />
+        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+        <ctl name="ADC2_MIXER Switch" value="1" />
+        <ctl name="ADC2 MUX" value="INP3" />
+        <ctl name="HDR12 MUX" value="NO_HDR12" />
+        <ctl name="ADC2 Volume" value="8" />
+    </path>
+
+   <path name="camcorder-tmic-azoom">
+        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />
+        <ctl name="TX DEC0 MUX" value="SWR_MIC"/>
+        <ctl name="TX SMIC MUX0" value="ADC0" />
+        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
+        <ctl name="ADC1_MIXER Switch" value="1" />
+        <ctl name="ADC1 Volume" value="6" />
+
+        <ctl name="TX DEC1 MUX" value="SWR_MIC"/>
+        <ctl name="TX SMIC MUX1" value="ADC3" />
+        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
+        <ctl name="ADC4_MIXER Switch" value="1" />
+        <ctl name="ADC4 MUX" value="INP5" />
+        <ctl name="ADC4 Volume" value="6" />
+
+        <ctl name="TX DEC2 MUX" value="SWR_MIC"/>
+        <ctl name="TX SMIC MUX2" value="ADC2" />
+        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+        <ctl name="ADC3_MIXER Switch" value="1" />
+        <ctl name="ADC3 MUX" value="INP4" />
+        <ctl name="HDR34 MUX" value="NO_HDR34" />
+        <ctl name="ADC3 Volume" value="6" />
+    </path>
+
+    <path name="game-tmic">
+        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />
+        <ctl name="TX DEC0 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX0" value="ADC0" />
+        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
+        <ctl name="ADC1_MIXER Switch" value="1" />
+        <ctl name="ADC1 Volume" value="8" />
+
+        <ctl name="TX DEC1 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX1" value="ADC3" />
+        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
+        <ctl name="ADC4_MIXER Switch" value="1" />
+        <ctl name="ADC4 MUX" value="INP5" />
+        <ctl name="ADC4 Volume" value="8" />
+
+        <ctl name="TX DEC2 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX2" value="ADC1" />
+        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+        <ctl name="ADC2_MIXER Switch" value="1" />
+        <ctl name="ADC2 MUX" value="INP3" />
+        <ctl name="HDR12 MUX" value="NO_HDR12" />
+        <ctl name="ADC2 Volume" value="8" />
+     </path>
+
+    <path name="spkr-vi-record">
+        <ctl name="TERT_TDM_RX_VI_FB_MUX" value="TERT_TDM_TX_0" />
+    </path>
 </mixer>
diff --git a/audio/sound_trigger_mixer_paths.xml b/audio/sound_trigger_mixer_paths.xml
index 193e19e..4a90f7a 100644
--- a/audio/sound_trigger_mixer_paths.xml
+++ b/audio/sound_trigger_mixer_paths.xml
@@ -81,7 +81,6 @@
     <ctl name="EC Reference Channels" value="Zero"/>
     <ctl name="EC Reference Bit Format" value="0"/>
     <ctl name="EC Reference SampleRate" value="0"/>
-    <ctl name="ADC2_MIXER Switch" value="0" />
     <ctl name="ADC1_MIXER Switch" value="1" />
     <ctl name="ADC4_MIXER Switch" value="1" />
     <ctl name="ADC4 MUX" value="INP5" />
@@ -236,37 +235,43 @@
     </path>
 
     <path name="listen-ape-handset-mic">
-        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
-        <ctl name="VA DEC0 MUX" value="SWR_MIC" />
-        <ctl name="VA SMIC MUX0" value="ADC0" />
-        <ctl name="ADC1_MIXER Switch" value="1" />
-        <ctl name="VA_DEC0 Volume" value="98" />
-    </path>
-
-    <path name="listen-ape-handset-mic-preproc">
         <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
         <ctl name="VA DEC0 MUX" value="SWR_MIC" />
         <ctl name="VA SMIC MUX0" value="ADC3" />
         <ctl name="ADC4_MIXER Switch" value="1" />
         <ctl name="ADC4 MUX" value="INP5" />
-        <ctl name="ADC4 Volume" value="12" />
+    </path>
+
+    <path name="listen-ape-handset-mic-preproc">
+        <path name="listen-ape-handset-mic" />
+    </path>
+
+    <path name="listen-ape-handset-dmic-lpi">
+        <ctl name="VA_CDC_DMA_TX_0 Channels" value="Two" />
+        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
+        <ctl name="VA_AIF1_CAP Mixer DEC1" value="1" />
+        <ctl name="VA DEC1 MUX" value="SWR_MIC" />
+        <ctl name="VA SMIC MUX1" value="ADC3" />
+        <ctl name="ADC4_MIXER Switch" value="1" />
+        <ctl name="ADC4 MUX" value="INP5" />
+        <ctl name="VA DEC0 MUX" value="SWR_MIC" />
+        <ctl name="VA SMIC MUX0" value="ADC0" />
+        <ctl name="ADC1_MIXER Switch" value="1" />
         <ctl name="VA_DEC0 Volume" value="84" />
+        <ctl name="VA_DEC1 Volume" value="84" />
     </path>
 
     <path name="listen-ape-handset-dmic">
         <ctl name="VA_CDC_DMA_TX_0 Channels" value="Two" />
         <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
         <ctl name="VA_AIF1_CAP Mixer DEC1" value="1" />
-        <ctl name="VA DEC0 MUX" value="SWR_MIC" />
-        <ctl name="VA SMIC MUX0" value="ADC3" />
+        <ctl name="VA DEC1 MUX" value="SWR_MIC" />
+        <ctl name="VA SMIC MUX1" value="ADC3" />
         <ctl name="ADC4_MIXER Switch" value="1" />
         <ctl name="ADC4 MUX" value="INP5" />
-        <ctl name="ADC4 Volume" value="8" />
-        <ctl name="VA DEC1 MUX" value="SWR_MIC" />
-        <ctl name="VA SMIC MUX1" value="ADC2" />
-        <ctl name="ADC3_MIXER Switch" value="1" />
-        <ctl name="ADC3 MUX" value="INP4" />
-        <ctl name="ADC3 Volume" value="8" />
+        <ctl name="VA DEC0 MUX" value="SWR_MIC" />
+        <ctl name="VA SMIC MUX0" value="ADC0" />
+        <ctl name="ADC1_MIXER Switch" value="1" />
         <ctl name="VA_DEC0 Volume" value="84" />
         <ctl name="VA_DEC1 Volume" value="84" />
     </path>
@@ -311,9 +316,9 @@
     </path>
 
     <path name="echo-reference">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="TERT_TDM_TX_0"/>
+        <ctl name="AUDIO_REF_EC_UL1 MUX" value="TERT_TDM_RX_0"/>
         <ctl name="EC Reference Channels" value="Two"/>
-        <ctl name="EC Reference Bit Format" value="S24_LE"/>
+        <ctl name="EC Reference Bit Format" value="S32_LE"/>
         <ctl name="EC Reference SampleRate" value="96000"/>
     </path>
 
diff --git a/audio/sound_trigger_platform_info.xml b/audio/sound_trigger_platform_info.xml
index ac24f60..53f7309 100644
--- a/audio/sound_trigger_platform_info.xml
+++ b/audio/sound_trigger_platform_info.xml
@@ -66,6 +66,7 @@
         <param DEVICE_HANDSET_QMIC_LPI_APE="181" />
         <param DEVICE_HEADSET_MIC_APE="141" />
         <param DEVICE_HEADSET_MIC_APE_LPI="182" />
+        <param DEVICE_HANDSET_DMIC_BT_APE="10037" />
     </acdb_ids>
 
     <!-- Multiple sound_model_config tags can be listed, each with unique   -->
@@ -74,7 +75,7 @@
 
     <!-- QTI SVA -->
     <sound_model_config>
-        <param vendor_uuid="68ab2d40-e860-11e3-95ef-0002a5d5c51b" />
+        <param vendor_uuid="61696d69-30f2-11e6-b0ac-40a8f03d3f1b" />
         <param execution_type="ADSP" />
         <param merge_first_stage_sound_models="false"/>
         <param max_ape_phrases="20" />
@@ -83,36 +84,8 @@
         <param sample_rate="16000" />
         <param bit_width="16" />
         <param out_channels="1"/> <!-- Module output channels -->
-
-        <arm_ss_usecase>
-            <!-- Options are "KEYWORD_DETECTION", "USER_VERIFICATION", "CUSTOM_DETECTION"  -->
-            <param sm_detection_type= "KEYWORD_DETECTION" />
-            <param sm_id="0x2" />
-            <param module_lib="libcapiv2svacnn.so"/>
-            <param sample_rate="16000"/>
-            <param bit_wdith="16"/>
-            <param channel_count="1"/>
-        </arm_ss_usecase>
-        <arm_ss_usecase>
-            <param sm_detection_type= "USER_VERIFICATION" />
-            <param sm_id="0x4" />
-            <param module_lib="libcapiv2vop.so"/>
-            <param sample_rate="16000"/>
-            <param bit_wdith="16"/>
-            <param channel_count="1"/>
-        </arm_ss_usecase>
-        <arm_ss_usecase>
-            <param sm_detection_type= "KEYWORD_DETECTION" />
-            <param sm_id="0x8" />
-            <param module_lib="libcapiv2svarnn.so"/>
-            <param sample_rate="16000"/>
-            <param bit_wdith="16"/>
-            <param channel_count="1"/>
-        </arm_ss_usecase>
-        <!-- Module and param ids with which the algorithm is integrated
-            in non-graphite firmware (note these must come after gcs params)
-            Extends flexibility to have different ids based on execution type.
-            valid execution_type values: "WDSP" "ADSP" -->
+        <param dam_token_id="1"/>
+        <param second_stage_supported="false"/>
         <lsm_usecase>
             <param capture_device="HANDSET" />
             <!-- adm_cfg_profile should match with the one defined under adm_config -->
@@ -132,25 +105,21 @@
             <!-- LPI: This mode type will be used for LPI usecases. -->
             <param lpi_mode="NON_LPI_BARGE_IN" />
             <param app_type="2" /> <!-- app type used in ACDB -->
-            <param in_channels="2"/> <!-- Module input channels -->
-            <param load_sound_model_ids="0x00012C1C, 0x0, 0x00012C14" />
-            <param unload_sound_model_ids="0x00012C1C, 0x0, 0x00012C15" />
-            <param confidence_levels_ids="0x00012C1C, 0x0, 0x00012C07" />
-            <param operation_mode_ids="0x00012C1C, 0x0, 0x00012C02" />
-            <param polling_enable_ids="0x00012C1C, 0x0, 0x00012C1B" />
-            <param custom_config_ids="0x00012C1C, 0x0, 0x00012C20" />
-            <param det_event_type_ids="0x00012C1C, 0x0, 0x00012C2C" />
+            <param in_channels="1"/> <!-- Module input channels -->
+            <param load_sound_model_ids="0x1000A301, 0x0, 0x00012C14" />
+            <param unload_sound_model_ids="0x1000A301, 0x0, 0x00012C15" />
+            <param custom_config_ids="0x1000A301, 0x0, 0x00012C20" />
             <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />
         </lsm_usecase>
         <lsm_usecase>
             <param capture_device="HANDSET" />
             <!-- adm_cfg_profile should match with the one defined under adm_config -->
             <!-- Set it to NONE if LSM directly connects to AFE -->
-            <param adm_cfg_profile="DEFAULT" />
+            <param adm_cfg_profile="FFECNS" />
             <!-- fluence_type: "FLUENCE_MIC", "FLUENCE_DMIC", "FLUENCE_TMIC"   -->
             <!-- "FLUENCE_QMIC". Param value is valid when adm_cfg_profile -->
             <!-- is FFECNS -->
-            <param fluence_type="NONE" />
+            <param fluence_type="FLUENCE_DMIC" />
             <param execution_mode="ADSP" />
             <!-- lpi_mode: "NON_LPI_BARGE_IN", "NON_LPI", "LPI" -->
             <!-- NON_LPI_BARGE_IN: Default non-LPI mode type. lsm_usecase -->
@@ -161,14 +130,10 @@
             <!-- LPI: This mode type will be used for LPI usecases. -->
             <param lpi_mode="LPI" />
             <param app_type="2" /> <!-- app type used in ACDB -->
-            <param in_channels="1"/> <!-- Module input channels -->
-            <param load_sound_model_ids="0x00012C1C, 0x0, 0x00012C14" />
-            <param unload_sound_model_ids="0x00012C1C, 0x0, 0x00012C15" />
-            <param confidence_levels_ids="0x00012C1C, 0x0, 0x00012C07" />
-            <param operation_mode_ids="0x00012C1C, 0x0, 0x00012C02" />
-            <param polling_enable_ids="0x00012C1C, 0x0, 0x00012C1B" />
-            <param custom_config_ids="0x00012C1C, 0x0, 0x00012C20" />
-            <param det_event_type_ids="0x00012C1C, 0x0, 0x00012C2C" />
+            <param in_channels="2"/> <!-- Module input channels -->
+            <param load_sound_model_ids="0x1000A301, 0x0, 0x00012C14" />
+            <param unload_sound_model_ids="0x1000A301, 0x0, 0x00012C15" />
+            <param custom_config_ids="0x1000A301, 0x0, 0x00012C20" />
             <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />
         </lsm_usecase>
         <lsm_usecase>
@@ -178,16 +143,11 @@
             <param execution_mode="ADSP" />
             <param app_type="2" /> <!-- app type used in ACDB -->
             <param in_channels="1"/> <!-- Module input channels -->
-            <param load_sound_model_ids="0x00012C1C, 0x0, 0x00012C14" />
-            <param unload_sound_model_ids="0x00012C1C, 0x0, 0x00012C15" />
-            <param confidence_levels_ids="0x00012C1C, 0x0, 0x00012C07" />
-            <param operation_mode_ids="0x00012C1C, 0x0, 0x00012C02" />
-            <param polling_enable_ids="0x00012C1C, 0x0, 0x00012C1B" />
-            <param custom_config_ids="0x00012C1C, 0x0, 0x00012C20" />
-            <param det_event_type_ids="0x00012C1C, 0x0, 0x00012C2C" />
+            <param load_sound_model_ids="0x1000A301, 0x0, 0x00012C14" />
+            <param unload_sound_model_ids="0x1000A301, 0x0, 0x00012C15" />
+            <param custom_config_ids="0x1000A301, 0x0, 0x00012C20" />
             <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />
         </lsm_usecase>
-
         <!-- format: "ADPCM_packet" or "PCM_packet" !-->
         <!-- transfer_mode: "FTRT" or "RT" -->
         <!--  kw_duration is in milli seconds. It is valid only for FTRT
@@ -198,7 +158,7 @@
 
         <!-- QTI SVA -->
     <sound_model_config>
-        <param vendor_uuid="68ab2d40-e860-11e3-95ef-0002a5d5c51c" />
+        <param vendor_uuid="61696d69-30f2-11e6-b0ac-40a8f03d3f1c" />
         <param execution_type="ADSP" />
         <param merge_first_stage_sound_models="false"/>
         <param max_ape_phrases="20" />
@@ -210,38 +170,8 @@
         <param dam_token_id="1"/>
         <param kw_start_tolerance="300"/>
         <param kw_end_tolerance="480"/>
+        <param second_stage_supported="false"/>
 
-        <arm_ss_usecase>
-            <!-- Options are "KEYWORD_DETECTION", "USER_VERIFICATION", "CUSTOM_DETECTION"  -->
-            <param sm_detection_type= "KEYWORD_DETECTION" />
-            <param sm_id="0x2" />
-            <param module_lib="libcapiv2svacnn.so"/>
-            <param sample_rate="16000"/>
-            <param bit_wdith="16"/>
-            <param channel_count="1"/>
-            <param data_after_kw_end="600"/>
-        </arm_ss_usecase>
-        <arm_ss_usecase>
-            <param sm_detection_type= "USER_VERIFICATION" />
-            <param sm_id="0x4" />
-            <param module_lib="libcapiv2vop.so"/>
-            <param sample_rate="16000"/>
-            <param bit_wdith="16"/>
-            <param channel_count="1"/>
-        </arm_ss_usecase>
-        <arm_ss_usecase>
-            <param sm_detection_type= "KEYWORD_DETECTION" />
-            <param sm_id="0x8" />
-            <param module_lib="libcapiv2svarnn.so"/>
-            <param sample_rate="16000"/>
-            <param bit_wdith="16"/>
-            <param channel_count="1"/>
-            <param data_after_kw_end="600"/>
-        </arm_ss_usecase>
-        <!-- Module and param ids with which the algorithm is integrated
-            in non-graphite firmware (note these must come after gcs params)
-            Extends flexibility to have different ids based on execution type.
-            valid execution_type values: "WDSP" "ADSP" -->
         <lsm_usecase>
             <param capture_device="HANDSET" />
             <!-- adm_cfg_profile should match with the one defined under adm_config -->
@@ -261,25 +191,21 @@
             <!-- LPI: This mode type will be used for LPI usecases. -->
             <param lpi_mode="NON_LPI_BARGE_IN" />
             <param app_type="2" /> <!-- app type used in ACDB -->
-            <param in_channels="2"/> <!-- Module input channels -->
-            <param load_sound_model_ids="0x00012C1C, 0x0, 0x00012C14" />
-            <param unload_sound_model_ids="0x00012C1C, 0x0, 0x00012C15" />
-            <param confidence_levels_ids="0x00012C1C, 0x0, 0x00012C07" />
-            <param operation_mode_ids="0x00012C1C, 0x0, 0x00012C02" />
-            <param polling_enable_ids="0x00012C1C, 0x0, 0x00012C1B" />
-            <param custom_config_ids="0x00012C1C, 0x0, 0x00012C20" />
-            <param det_event_type_ids="0x00012C1C, 0x0, 0x00012C2C" />
+            <param in_channels="1"/> <!-- Module input channels -->
+            <param load_sound_model_ids="0x1000A301, 0x0, 0x00012C14" />
+            <param unload_sound_model_ids="0x1000A301, 0x0, 0x00012C15" />
+            <param custom_config_ids="0x1000A301, 0x0, 0x00012C20" />
             <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />
         </lsm_usecase>
         <lsm_usecase>
             <param capture_device="HANDSET" />
             <!-- adm_cfg_profile should match with the one defined under adm_config -->
             <!-- Set it to NONE if LSM directly connects to AFE -->
-            <param adm_cfg_profile="DEFAULT" />
+            <param adm_cfg_profile="FFECNS" />
             <!-- fluence_type: "FLUENCE_MIC", "FLUENCE_DMIC", "FLUENCE_TMIC"   -->
             <!-- "FLUENCE_QMIC". Param value is valid when adm_cfg_profile -->
             <!-- is FFECNS -->
-            <param fluence_type="NONE" />
+            <param fluence_type="FLUENCE_DMIC" />
             <param execution_mode="ADSP" />
             <!-- lpi_mode: "NON_LPI_BARGE_IN", "NON_LPI", "LPI" -->
             <!-- NON_LPI_BARGE_IN: Default non-LPI mode type. lsm_usecase -->
@@ -290,14 +216,10 @@
             <!-- LPI: This mode type will be used for LPI usecases. -->
             <param lpi_mode="LPI" />
             <param app_type="2" /> <!-- app type used in ACDB -->
-            <param in_channels="1"/> <!-- Module input channels -->
-            <param load_sound_model_ids="0x00012C1C, 0x0, 0x00012C14" />
-            <param unload_sound_model_ids="0x00012C1C, 0x0, 0x00012C15" />
-            <param confidence_levels_ids="0x00012C1C, 0x0, 0x00012C07" />
-            <param operation_mode_ids="0x00012C1C, 0x0, 0x00012C02" />
-            <param polling_enable_ids="0x00012C1C, 0x0, 0x00012C1B" />
-            <param custom_config_ids="0x00012C1C, 0x0, 0x00012C20" />
-            <param det_event_type_ids="0x00012C1C, 0x0, 0x00012C2C" />
+            <param in_channels="2"/> <!-- Module input channels -->
+            <param load_sound_model_ids="0x1000A301, 0x0, 0x00012C14" />
+            <param unload_sound_model_ids="0x1000A301, 0x0, 0x00012C15" />
+            <param custom_config_ids="0x1000A301, 0x0, 0x00012C20" />
             <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />
         </lsm_usecase>
         <lsm_usecase>
@@ -307,16 +229,11 @@
             <param execution_mode="ADSP" />
             <param app_type="2" /> <!-- app type used in ACDB -->
             <param in_channels="1"/> <!-- Module input channels -->
-            <param load_sound_model_ids="0x00012C1C, 0x0, 0x00012C14" />
-            <param unload_sound_model_ids="0x00012C1C, 0x0, 0x00012C15" />
-            <param confidence_levels_ids="0x00012C1C, 0x0, 0x00012C07" />
-            <param operation_mode_ids="0x00012C1C, 0x0, 0x00012C02" />
-            <param polling_enable_ids="0x00012C1C, 0x0, 0x00012C1B" />
-            <param custom_config_ids="0x00012C1C, 0x0, 0x00012C20" />
-            <param det_event_type_ids="0x00012C1C, 0x0, 0x00012C2C" />
+            <param load_sound_model_ids="0x1000A301, 0x0, 0x00012C14" />
+            <param unload_sound_model_ids="0x1000A301, 0x0, 0x00012C15" />
+            <param custom_config_ids="0x1000A301, 0x0, 0x00012C20" />
             <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />
         </lsm_usecase>
-
         <!-- format: "ADPCM_packet" or "PCM_packet" !-->
         <!-- transfer_mode: "FTRT" or "RT" -->
         <!--  kw_duration is in milli seconds. It is valid only for FTRT
@@ -327,7 +244,7 @@
 
         <!-- QTI SVA -->
     <sound_model_config>
-        <param vendor_uuid="68ab2d40-e860-11e3-95ef-0002a5d5c51d" />
+        <param vendor_uuid="61696d69-30f2-11e6-b0ac-40a8f03d3f1d" />
         <param execution_type="ADSP" />
         <param merge_first_stage_sound_models="false"/>
         <param max_ape_phrases="20" />
@@ -339,38 +256,8 @@
         <param dam_token_id="1"/>
         <param kw_start_tolerance="700"/>
         <param kw_end_tolerance="600"/>
+        <param second_stage_supported="false"/>
 
-        <arm_ss_usecase>
-            <!-- Options are "KEYWORD_DETECTION", "USER_VERIFICATION", "CUSTOM_DETECTION"  -->
-            <param sm_detection_type= "KEYWORD_DETECTION" />
-            <param sm_id="0x2" />
-            <param module_lib="libcapiv2svacnn.so"/>
-            <param sample_rate="16000"/>
-            <param bit_wdith="16"/>
-            <param channel_count="1"/>
-            <param data_after_kw_end="1000"/>
-        </arm_ss_usecase>
-        <arm_ss_usecase>
-            <param sm_detection_type= "USER_VERIFICATION" />
-            <param sm_id="0x4" />
-            <param module_lib="libcapiv2vop.so"/>
-            <param sample_rate="16000"/>
-            <param bit_wdith="16"/>
-            <param channel_count="1"/>
-        </arm_ss_usecase>
-        <arm_ss_usecase>
-            <param sm_detection_type= "KEYWORD_DETECTION" />
-            <param sm_id="0x8" />
-            <param module_lib="libcapiv2svarnn.so"/>
-            <param sample_rate="16000"/>
-            <param bit_wdith="16"/>
-            <param channel_count="1"/>
-            <param data_after_kw_end="1000"/>
-        </arm_ss_usecase>
-        <!-- Module and param ids with which the algorithm is integrated
-            in non-graphite firmware (note these must come after gcs params)
-            Extends flexibility to have different ids based on execution type.
-            valid execution_type values: "WDSP" "ADSP" -->
         <lsm_usecase>
             <param capture_device="HANDSET" />
             <!-- adm_cfg_profile should match with the one defined under adm_config -->
@@ -390,25 +277,21 @@
             <!-- LPI: This mode type will be used for LPI usecases. -->
             <param lpi_mode="NON_LPI_BARGE_IN" />
             <param app_type="2" /> <!-- app type used in ACDB -->
-            <param in_channels="2"/> <!-- Module input channels -->
-            <param load_sound_model_ids="0x00012C1C, 0x0, 0x00012C14" />
-            <param unload_sound_model_ids="0x00012C1C, 0x0, 0x00012C15" />
-            <param confidence_levels_ids="0x00012C1C, 0x0, 0x00012C07" />
-            <param operation_mode_ids="0x00012C1C, 0x0, 0x00012C02" />
-            <param polling_enable_ids="0x00012C1C, 0x0, 0x00012C1B" />
-            <param custom_config_ids="0x00012C1C, 0x0, 0x00012C20" />
-            <param det_event_type_ids="0x00012C1C, 0x0, 0x00012C2C" />
+            <param in_channels="1"/> <!-- Module input channels -->
+            <param load_sound_model_ids="0x1000A301, 0x0, 0x00012C14" />
+            <param unload_sound_model_ids="0x1000A301, 0x0, 0x00012C15" />
+            <param custom_config_ids="0x1000A301, 0x0, 0x00012C20" />
             <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />
         </lsm_usecase>
         <lsm_usecase>
             <param capture_device="HANDSET" />
             <!-- adm_cfg_profile should match with the one defined under adm_config -->
             <!-- Set it to NONE if LSM directly connects to AFE -->
-            <param adm_cfg_profile="DEFAULT" />
+            <param adm_cfg_profile="FFECNS" />
             <!-- fluence_type: "FLUENCE_MIC", "FLUENCE_DMIC", "FLUENCE_TMIC"   -->
             <!-- "FLUENCE_QMIC". Param value is valid when adm_cfg_profile -->
             <!-- is FFECNS -->
-            <param fluence_type="NONE" />
+            <param fluence_type="FLUENCE_DMIC" />
             <param execution_mode="ADSP" />
             <!-- lpi_mode: "NON_LPI_BARGE_IN", "NON_LPI", "LPI" -->
             <!-- NON_LPI_BARGE_IN: Default non-LPI mode type. lsm_usecase -->
@@ -419,14 +302,10 @@
             <!-- LPI: This mode type will be used for LPI usecases. -->
             <param lpi_mode="LPI" />
             <param app_type="2" /> <!-- app type used in ACDB -->
-            <param in_channels="1"/> <!-- Module input channels -->
-            <param load_sound_model_ids="0x00012C1C, 0x0, 0x00012C14" />
-            <param unload_sound_model_ids="0x00012C1C, 0x0, 0x00012C15" />
-            <param confidence_levels_ids="0x00012C1C, 0x0, 0x00012C07" />
-            <param operation_mode_ids="0x00012C1C, 0x0, 0x00012C02" />
-            <param polling_enable_ids="0x00012C1C, 0x0, 0x00012C1B" />
-            <param custom_config_ids="0x00012C1C, 0x0, 0x00012C20" />
-            <param det_event_type_ids="0x00012C1C, 0x0, 0x00012C2C" />
+            <param in_channels="2"/> <!-- Module input channels -->
+            <param load_sound_model_ids="0x1000A301, 0x0, 0x00012C14" />
+            <param unload_sound_model_ids="0x1000A301, 0x0, 0x00012C15" />
+            <param custom_config_ids="0x1000A301, 0x0, 0x00012C20" />
             <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />
         </lsm_usecase>
         <lsm_usecase>
@@ -436,16 +315,11 @@
             <param execution_mode="ADSP" />
             <param app_type="2" /> <!-- app type used in ACDB -->
             <param in_channels="1"/> <!-- Module input channels -->
-            <param load_sound_model_ids="0x00012C1C, 0x0, 0x00012C14" />
-            <param unload_sound_model_ids="0x00012C1C, 0x0, 0x00012C15" />
-            <param confidence_levels_ids="0x00012C1C, 0x0, 0x00012C07" />
-            <param operation_mode_ids="0x00012C1C, 0x0, 0x00012C02" />
-            <param polling_enable_ids="0x00012C1C, 0x0, 0x00012C1B" />
-            <param custom_config_ids="0x00012C1C, 0x0, 0x00012C20" />
-            <param det_event_type_ids="0x00012C1C, 0x0, 0x00012C2C" />
+            <param load_sound_model_ids="0x1000A301, 0x0, 0x00012C14" />
+            <param unload_sound_model_ids="0x1000A301, 0x0, 0x00012C15" />
+            <param custom_config_ids="0x1000A301, 0x0, 0x00012C20" />
             <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />
         </lsm_usecase>
-
         <!-- format: "ADPCM_packet" or "PCM_packet" !-->
         <!-- transfer_mode: "FTRT" or "RT" -->
         <!--  kw_duration is in milli seconds. It is valid only for FTRT
@@ -518,7 +392,6 @@
         <param sample_rate="16000" />
         <param bit_width="16" />
         <param out_channels="1"/> <!-- Module output channels -->
-        <param get_module_version="true"/>
         <lsm_usecase>
             <param capture_device="HANDSET" />
             <!-- adm_cfg_profile should match with the one defined under adm_config -->
@@ -543,7 +416,6 @@
             <param unload_sound_model_ids="0x18000001, 0x0, 0x00012C15" />
             <param custom_config_ids="0x18000001, 0x0, 0x00012C20" />
             <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />
-            <param version_ids="0x18000001, 0x0, 0x18000101" />
         </lsm_usecase>
         <lsm_usecase>
             <param capture_device="HANDSET" />
@@ -569,7 +441,6 @@
             <param unload_sound_model_ids="0x18000001, 0x0, 0x00012C15" />
             <param custom_config_ids="0x18000001, 0x0, 0x00012C20" />
             <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />
-            <param version_ids="0x18000001, 0x0, 0x18000101" />
         </lsm_usecase>
         <lsm_usecase>
             <param capture_device="HEADSET" />
@@ -582,7 +453,6 @@
             <param unload_sound_model_ids="0x18000001, 0x0, 0x00012C15" />
             <param custom_config_ids="0x18000001, 0x0, 0x00012C20" />
             <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />
-            <param version_ids="0x18000001, 0x0, 0x18000101" />
         </lsm_usecase>
 
         <!-- format: "ADPCM_packet" or "PCM_packet" !-->
@@ -613,7 +483,7 @@
             <!-- is FFECNS -->
             <param fluence_type="NONE" />
             <param execution_mode="ADSP" />
-            <param app_type="3" /> <!-- app type used in ACDB -->
+            <param app_type="4" /> <!-- app type used in ACDB -->
             <param in_channels="1"/> <!-- Module input channels -->
             <param load_sound_model_ids="0x18000001, 0x0, 0x00012C14" />
             <param unload_sound_model_ids="0x18000001, 0x0, 0x00012C15" />
@@ -627,7 +497,7 @@
             <param adm_cfg_profile="DEFAULT" />
             <param fluence_type="NONE" />
             <param execution_mode="ADSP" />
-            <param app_type="3" /> <!-- app type used in ACDB -->
+            <param app_type="4" /> <!-- app type used in ACDB -->
             <param in_channels="1"/> <!-- Module input channels -->
             <param load_sound_model_ids="0x18000001, 0x0, 0x00012C14" />
             <param unload_sound_model_ids="0x18000001, 0x0, 0x00012C15" />
@@ -652,7 +522,7 @@
         <param app_type="69947" />
         <param sample_rate="16000" />
         <param bit_width="16" />
-        <param out_channels="2"/>
+        <param out_channels="3"/>
     </adm_config>
 
     <adm_config>