diff --git a/audio/audio_platform_info.xml b/audio/audio_platform_info.xml
index 02e6290..ea1c845 100644
--- a/audio/audio_platform_info.xml
+++ b/audio/audio_platform_info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2014, 2016-2020, The Linux Foundation. All rights reserved.   -->
+<!-- Copyright (c) 2014, 2016-2020, The Linux Foundation. All rights reserved. -->
 <!--                                                                        -->
 <!-- Redistribution and use in source and binary forms, with or without     -->
 <!-- modification, are permitted provided that the following conditions are -->
@@ -82,7 +82,9 @@
         <usecase name="USECASE_AUDIO_SPKR_CALIB_TX" type="in" id="33"/>
         <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_AFE_PROXY2" type="in" id="42"/>
+        <!--#Isha.Padiyar@MULTIMEDIA.AUDIODRIVER.HAL, 2022/09/22, Add for hearing-aid support-->
+        <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY2" type="in" id="41"/>
+        <!--#Isha.Padiyar@MULTIMEDIA.AUDIODRIVER.HAL, 2022/09/22, Add for hearing-aid support-->
         <usecase name="USECASE_AUDIO_RECORD_LOW_LATENCY" type="in" id="13" />
         <usecase name="USECASE_AUDIO_RECORD_VOIP_LOW_LATENCY" type="in" id="13" />
         <usecase name="USECASE_AUDIO_PLAYBACK_ULL" type="out" id="13" />
@@ -101,6 +103,12 @@
         <usecase name="USECASE_INCALL_REC_UPLINK" type="in" id="23" />
         <usecase name="USECASE_INCALL_REC_DOWNLINK" type="in" id="23" />
         <usecase name="USECASE_INCALL_REC_UPLINK_AND_DOWNLINK" type="in" id="23" />
+        <!--Jianfeng.Qiu@MULTIMEDIA.AUDIODRIVER.OPLUS_FEATURE_KTV, 2017/04/05, Add for ktv loopback-->
+        <usecase name="USECASE_AUDIO_OPLUS_KTV" type="in" id="33" />
+        <usecase name="USECASE_AUDIO_OPLUS_KTV" type="out" id="33" />
+        <usecase name="USECASE_AUDIO_OPLUS_KTV_USB_HS" type="in" id="33" />
+        <usecase name="USECASE_AUDIO_OPLUS_KTV_USB_HS" type="out" id="33" />
+        <!--Jianfeng.Qiu@MULTIMEDIA.AUDIODRIVER.OPLUS_FEATURE_KTV, 2017/04/05, Add for ktv loopback end-->
     </pcm_ids>
     <config_params>
         <!-- In the below value string, the value indicates default mono -->
@@ -108,13 +116,33 @@
         <param key="mono_speaker" value="right"/>
         <param key="true_32_bit" value="true"/>
         <param key="hifi_filter" value="false"/>
-        <param key="native_audio_mode" value="multiple_mix_dsp"/>
+        <param key="native_audio_mode" value="false"/>
         <param key="hfp_pcm_dev_id" value="39"/>
         <param key="input_mic_max_count" value="4"/>
-        <!-- In the below value string, the value indicates whether the -->
-        <!-- target does not supports speaker and headphone working on  -->
-        <!-- different fractional and integer sampling rate             -->
-        <param key="spkr_hph_single_be_native_concurrency" value="true"/>
+        <!--#Le.li@PSW.MM.AudioDriver.HAL, 2020/10/11, Add for audio conifg begin -->
+        <!--Vincent.chen@MULTIMEDIA.AUDIODRIVER.HAL, 2022/01/10, change mic count to 2 for N200 from R -->
+        <!-- <param key="oppo_mic_count" value="1"/> -->
+        <param key="oplus_mic_count" value="2"/>
+        <!--Vincent.chen@MULTIMEDIA.AUDIODRIVER.HAL, 2022/01/10, change mic count to 2 for N200 from R end-->
+        <param key="oppo_speaker_id" value="1"/>
+        <param key="oppo_multi_record" value="false"/>
+        <!--#Le.li@PSW.MM.AudioDriver.HAL, 2020/10/11, Add for audio conifg config end -->
+        <!--#Juqiang.Geng@MULTIMEDIA.AUDIODRIVER.HAL.OPLUS_FEATURE_AP_LVIMFS, 2020/08/24, Add for AP LVIMFS-->
+        <param key="record_use_ap_lvimfs" value="enable"/>
+        <!--#Juqiang.Geng@MULTIMEDIA.AUDIODRIVER.HAL, 2020/08/24, Add for AP LVIMFS end-->
+        <!--#Nan.Zhong@MULTIMEDIA.AUDIODRIVER.HAL, 2020/11/13, Add for tty mode-->
+        <param key="oplus_tty_support" value="0"/>
+        <!--#Nan.Zhong@MULTIMEDIA.AUDIODRIVER.HAL, 2020/11/13, Add for tty mode end-->
+        <!--#Le.LI@MULTIMEDIA.AUDIODRIVER.HAL, 2020/11/20, Add for smartPa eng support-->
+        <param key="emsmartcalibratesupport" value="0"/>
+        <!--#Le.LI@MULTIMEDIA.AUDIODRIVER.HAL, 2020/11/20, Add for smartPa eng support end-->
+        <!--Run.Zhang@MULTIMEDIA.AUDIODRIVER.FEATURE, 2021/04/09 , Add for headphone volume match to impedance -->
+        <param key="enable_hp_impedance_match" value="true"/>
+        <param key="hp_impedance_match_threshold" value="65"/>
+        <!--Run.Zhang@MULTIMEDIA.AUDIODRIVER.FEATURE, 2021/04/09 , Add for headphone volume match to impedance end-->
+        <!--chenshuyun@MULTIMEDIA.AUDIODRIVER.HAL, 2022/01/21, Add for camcorder switch mic -->
+        <param key="camcorder_switch_mic" value="true"/>
+        <!--chenshuyun@MULTIMEDIA.AUDIODRIVER.HAL, 2022/01/21, Add for camcorder switch mic end -->
     </config_params>
     <gain_db_to_level_mapping>
         <gain_level_map db="-59" level="5"/>
@@ -124,7 +152,7 @@
         <gain_level_map db="0" level="1"/>
     </gain_db_to_level_mapping>
     <acdb_ids>
-        <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="14"/>
+        <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="15"/>
         <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" acdb_id="15"/>
         <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" acdb_id="124"/>
         <device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED" acdb_id="101"/>
@@ -148,6 +176,60 @@
         <device name="SND_DEVICE_IN_HANDSET_GENERIC_QMIC" acdb_id="191"/>
         <device name="SND_DEVICE_IN_VOICE_HEARING_AID" acdb_id="11"/>
         <device name="SND_DEVICE_OUT_VOICE_HANDSET_TMUS" acdb_id="7"/>
+        <!--Vincent.chen@MULTIMEDIA.AUDIODRIVER.HAL, 2021/11/10, add for HAC-->
+        <device name="SND_DEVICE_IN_VOICE_DMIC_TMUS" acdb_id="41"/>
+        <device name="SND_DEVICE_OUT_VOICE_HAC_HANDSET" acdb_id="103"/>
+        <device name="SND_DEVICE_IN_VOICE_HAC_HANDSET_DMIC" acdb_id="105"/>
+        <!--Vincent.chen@MULTIMEDIA.AUDIODRIVER.HAL, 2021/11/10, add for HAC end-->
+        <!--#Le.li@PSW.MM.AudioDriver.HAL, 2020/10/11, Add for oplus FTM config begin -->
+        <device name="SND_DEVICE_OUT_VOICE_HANDSET" acdb_id="7"/>
+        <device name="SND_DEVICE_IN_UNPROCESSED_USB_HEADSET_MIC" acdb_id="133"/>
+        <device name="SND_DEVICE_OUT_MMI_SPEAKER_PLAYBACK" acdb_id="99"/>
+        <device name="SND_DEVICE_OUT_MMI_LEFT_SPEAKER_PLAYBACK" acdb_id="124"/>
+        <device name="SND_DEVICE_OUT_MMI_RECEIVER_PLAYBACK" acdb_id="30"/>
+        <device name="SND_DEVICE_OUT_ENGINNER_RECIVER_TEST" acdb_id="30"/>
+        <device name="SND_DEVICE_IN_MAIN_MIC_RECORD" acdb_id="104"/>
+        <device name="SND_DEVICE_IN_SEC_MIC_RECORD" acdb_id="104"/>
+        <device name="SND_DEVICE_IN_ANC_MIC_RECORD" acdb_id="104"/>
+        <device name="SND_DEVICE_IN_MMI_MIC_RECORD" acdb_id="144"/>
+        <device name="SND_DEVICE_IN_MMI_ANC_MIC_RECORD" acdb_id="144"/>
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" acdb_id="14"/>
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO" acdb_id="14"/>
+        <!--Vincent.chen@MULTIMEDIA.AUDIODRIVER.HAL, 2022/01/10, change voice headset headphone id to 10 sync R -->
+        <!--<device name="SND_DEVICE_OUT_VOICE_HEADPHONES" acdb_id="9"/>
+        <device name="SND_DEVICE_OUT_VOICE_HEADSET" acdb_id="9"/> -->
+        <device name="SND_DEVICE_OUT_VOICE_HEADPHONES" acdb_id="10"/>
+        <device name="SND_DEVICE_OUT_VOICE_HEADSET" acdb_id="10"/>
+        <!--Vincent.chen@MULTIMEDIA.AUDIODRIVER.HAL, 2022/01/10, change voice headset headphone id to 10 sync R -->
+        <device name="SND_DEVICE_IN_HEADSET_MIC" acdb_id="23"/>
+        <device name="SND_DEVICE_IN_CAMCORDER_MIC" acdb_id="46"/>
+        <!--#Le.li@PSW.MM.AudioDriver.HAL, 2020/10/11, Add for oplus FTM config end   -->
+        <device name="SND_DEVICE_OUT_DUMMY" acdb_id="15"/>
+        <device name="SND_DEVICE_IN_HANDSET_MIC_HEARING_TEST" acdb_id="91"/>
+        <!--chenshuyun@MULTIMEDIA.AUDIODRIVER.HAL, 2022/01/21, Add for camcorder switch mic -->
+        <device name="SND_DEVICE_IN_HANDSET_DMIC_STEREO_SWITCH" acdb_id="34"/>
+        <!--chenshuyun@MULTIMEDIA.AUDIODRIVER.HAL, 2022/01/21, Add for camcorder switch mic end-->
+        <device name="SND_DEVICE_IN_HANDSET_MIC" acdb_id="34"/>
+        <device name="SND_DEVICE_IN_SPEAKER_MIC" acdb_id="35"/>
+        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" acdb_id="43"/>
+        <device name="SND_DEVICE_IN_HANDSET_TMIC" acdb_id="41"/>
+        <device name="SND_DEVICE_IN_VOICE_SPEAKER_TMIC" acdb_id="43"/>
+        <device name="SND_DEVICE_IN_HANDSET_MIC_AEC" acdb_id="108"/>
+        <device name="SND_DEVICE_IN_HANDSET_MIC_NS" acdb_id="108"/>
+        <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC" acdb_id="114"/>
+        <device name="SND_DEVICE_IN_SPEAKER_MIC_NS" acdb_id="114"/>
+        <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC" acdb_id="111"/>
+        <device name="SND_DEVICE_IN_HANDSET_DMIC_NS" acdb_id="111"/>
+        <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC" acdb_id="117"/>
+        <device name="SND_DEVICE_IN_SPEAKER_DMIC_NS" acdb_id="117"/>
+        <device name="SND_DEVICE_IN_HANDSET_TMIC_AEC" acdb_id="156"/>
+        <device name="SND_DEVICE_IN_HANDSET_TMIC_NS" acdb_id="156"/>
+        <device name="SND_DEVICE_IN_SPEAKER_TMIC_AEC" acdb_id="160"/>
+        <device name="SND_DEVICE_IN_SPEAKER_TMIC_NS" acdb_id="160"/>
+        <!--Jianfeng.Qiu@MULTIMEDIA.AUDIODRIVER.OPLUS_FEATURE_KTV, 2017/04/05, Add for ktv loopback-->
+        <device name="SND_DEVICE_IN_HEADSET_MIC_KTV" acdb_id="98"/>
+        <device name="SND_DEVICE_IN_USB_HEADSET_MIC_KTV" acdb_id="98"/>
+        <!--Jianfeng.Qiu@MULTIMEDIA.AUDIODRIVER.OPLUS_FEATURE_KTV, 2017/04/05, Add for ktv loopback end-->
     </acdb_ids>
     <backend_names>
         <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
@@ -179,6 +261,9 @@
         <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1" interface="RX_CDC_DMA_RX_1-and-RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2" interface="RX_CDC_DMA_RX_1-and-RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_VOICE_HANDSET" backend="handset" interface="RX_CDC_DMA_RX_0"/>
+        <!--Vincent.chen@MULTIMEDIA.AUDIODRIVER.HAL, 2021/11/10, add for HAC-->
+        <device name="SND_DEVICE_OUT_VOICE_HAC_HANDSET" backend="handset" interface="RX_CDC_DMA_RX_0"/>
+        <!--Vincent.chen@MULTIMEDIA.AUDIODRIVER.HAL, 2021/11/10, add for HAC end-->
         <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="RX_CDC_DMA_RX_1"/>
@@ -223,6 +308,9 @@
         <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS_SB" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_HANDSET_DMIC_STEREO" interface="TX_CDC_DMA_TX_3"/>
+        <!--chenshuyun@MULTIMEDIA.AUDIODRIVER.HAL, 2022/01/21, Add for camcorder switch mic -->
+        <device name="SND_DEVICE_IN_HANDSET_DMIC_STEREO_SWITCH" interface="TX_CDC_DMA_TX_3"/>
+        <!--chenshuyun@MULTIMEDIA.AUDIODRIVER.HAL, 2022/01/21, Add for camcorder switch mic end-->
         <device name="SND_DEVICE_IN_SPEAKER_MIC" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_SPEAKER_MIC_SB" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC" interface="TX_CDC_DMA_TX_3"/>
@@ -261,6 +349,9 @@
         <device name="SND_DEVICE_IN_BT_SCO_MIC_WB_NREC" interface="SLIMBUS_7_TX"/>
         <device name="SND_DEVICE_IN_CAMCORDER_MIC" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_VOICE_DMIC" interface="TX_CDC_DMA_TX_3"/>
+        <!--Vincent.chen@MULTIMEDIA@MULTIMEDIA.AUDIODRIVER.HAL, 2021/11/10, add for HAC-->
+        <device name="SND_DEVICE_IN_VOICE_HAC_HANDSET_DMIC" interface="TX_CDC_DMA_TX_3"/>
+        <!--Vincent.chen@MULTIMEDIA.AUDIODRIVER.HAL, 2021/11/10, add for HAC end-->
         <device name="SND_DEVICE_IN_VOICE_DMIC_SB" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_VOICE_SPEAKER_DMIC" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_VOICE_SPEAKER_DMIC_SB" interface="TX_CDC_DMA_TX_3"/>
@@ -307,6 +398,25 @@
         <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="RX_CDC_DMA_RX_1-and-SLIMBUS_7_RX"/>
         <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_SWB" backend="speaker-and-bt-sco-swb" interface="RX_CDC_DMA_RX_1-and-SLIMBUS_7_RX"/>
         <device name="SND_DEVICE_OUT_HEADPHONES_DSD" backend="headphones-dsd" interface="RX_CDC_DMA_RX_5"/>
+        <!--#Le.li@PSW.MM.AudioDriver.HAL, 2020/10/11, Add for oplus FTM config begin -->
+        <device name="SND_DEVICE_OUT_MMI_RECEIVER_PLAYBACK"  backend="handset" interface="RX_CDC_DMA_RX_0"/>
+        <device name="SND_DEVICE_OUT_ENGINNER_RECIVER_TEST"  backend="handset" interface="RX_CDC_DMA_RX_0"/>
+        <device name="SND_DEVICE_OUT_MMI_SPEAKER_PLAYBACK" interface="RX_CDC_DMA_RX_1"/>
+        <device name="SND_DEVICE_OUT_MMI_LEFT_SPEAKER_PLAYBACK" interface="RX_CDC_DMA_RX_1"/>
+        <device name="SND_DEVICE_IN_MAIN_MIC_RECORD" interface="TX_CDC_DMA_TX_3"/>
+        <device name="SND_DEVICE_IN_SEC_MIC_RECORD" interface="TX_CDC_DMA_TX_3"/>
+        <device name="SND_DEVICE_IN_ANC_MIC_RECORD" interface="TX_CDC_DMA_TX_3"/>
+        <device name="SND_DEVICE_IN_MMI_MIC_RECORD" interface="TX_CDC_DMA_TX_3"/>
+        <device name="SND_DEVICE_IN_MMI_ANC_MIC_RECORD" interface="TX_CDC_DMA_TX_3"/>
+        <device name="SND_DEVICE_IN_HANDSET_MIC_HEARING_TEST" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>
+        <!--#Le.li@PSW.MM.AudioDriver.HAL, 2020/10/11, Add for oplus FTM config end   -->
+        <!--Jianfeng.Qiu@MULTIMEDIA.AUDIODRIVER.OPLUS_FEATURE_KTV, 2017/04/05, Add for ktv loopback-->
+        <device name="SND_DEVICE_IN_HEADSET_MIC_KTV" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>
+        <device name="SND_DEVICE_IN_USB_HEADSET_MIC_KTV" backend="usb-headset-mic" interface="USB_AUDIO_TX"/>
+        <!--Jianfeng.Qiu@MULTIMEDIA.AUDIODRIVER.OPLUS_FEATURE_KTV, 2017/04/05, Add for ktv loopback end-->
+        <!-- Kaijia.Lin@PSW.MM.AudioDriver.HAL, 2019/10/12, Add for dummy dev START -->
+        <device name="SND_DEVICE_OUT_DUMMY" backend="dummy" interface="AFE_PCM_RX"/>
+        <!-- Kaijia.Lin@PSW.MM.AudioDriver.HAL, 2019/10/12, Add for dummy dev END -->
     </backend_names>
     <!-- below values are for ref purpose to OEM, doesn't contain actual hardware info on MTP -->
     <microphone_characteristics>
@@ -360,8 +470,6 @@
                     <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_DMIC">
                         <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"/>
                     </snd_dev>
                     <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_DMIC_TMUS">
                         <mic_info mic_device_id="builtin_mic_1"
@@ -469,3 +577,4 @@
         </input_snd_device>
     </snd_devices>
 </audio_platform_info>
+
diff --git a/audio/sound_trigger_mixer_paths.xml b/audio/sound_trigger_mixer_paths.xml
index ab8455e..089ee7a 100644
--- a/audio/sound_trigger_mixer_paths.xml
+++ b/audio/sound_trigger_mixer_paths.xml
@@ -56,6 +56,12 @@
     <ctl name="VA_AIF1_CAP Mixer DEC7" value="0" />
     <ctl name="VA DEC0 MUX" value="MSM_DMIC" />
     <ctl name="VA DEC1 MUX" value="MSM_DMIC" />
+    <ctl name="VA DEC2 MUX" value="MSM_DMIC" />
+    <ctl name="VA DEC3 MUX" value="MSM_DMIC" />
+    <ctl name="VA DEC4 MUX" value="MSM_DMIC" />
+    <ctl name="VA DEC5 MUX" value="MSM_DMIC" />
+    <ctl name="VA DEC6 MUX" value="MSM_DMIC" />
+    <ctl name="VA DEC7 MUX" value="MSM_DMIC" />
     <ctl name="VA DMIC MUX0" value="ZERO" />
     <ctl name="VA DMIC MUX1" value="ZERO" />
     <ctl name="VA DMIC MUX2" value="ZERO" />
@@ -72,11 +78,14 @@
     <ctl name="VA SMIC MUX5" value="ZERO" />
     <ctl name="VA SMIC MUX6" value="ZERO" />
     <ctl name="VA SMIC MUX7" value="ZERO" />
+    <ctl name="AUDIO_REF_EC_UL1 MUX" value="None"/>
+    <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="ADC2 MUX" value="ZERO" />
     <ctl name="LPI Enable" value="0" />
+    <ctl name="ADC2 Volume" value="12" />
     <ctl name="VA_DEC0 MODE" value="ADC_DEFAULT" />
     <ctl name="ADC2_BCS Disable" value="0" />
 
@@ -241,9 +250,13 @@
     </path>
 
     <path name="listen-ape-handset-mic">
+        <ctl name="VA_CDC_DMA_TX_0 Channels" value="One" />
         <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
-        <ctl name="VA DEC0 MUX" value="MSM_DMIC" />
-        <ctl name="VA DMIC MUX0" value="DMIC2" />
+        <ctl name="VA DEC0 MUX" value="SWR_MIC" />
+        <ctl name="VA SMIC MUX0" value="SWR_MIC4" />
+        <ctl name="ADC2 ChMap" value="SWRM_TX2_CH1" />
+        <ctl name="ADC2_MIXER Switch" value="1" />
+        <ctl name="ADC2 MUX" value="INP3" />
     </path>
 
     <path name="listen-ape-handset-mic-preproc">
@@ -254,10 +267,44 @@
         <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="SWR_MIC4" />
+        <ctl name="ADC2 ChMap" value="SWRM_TX2_CH1" />
+        <ctl name="ADC2_MIXER Switch" value="1" />
+        <ctl name="ADC2 MUX" value="INP3" />
+        <ctl name="VA DEC1 MUX" value="SWR_MIC" />
+        <ctl name="VA SMIC MUX1" value="SWR_MIC0" />
+        <ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />
+        <ctl name="ADC1_MIXER Switch" value="1" />
+    </path>
+
+    <path name="listen-ape-handset-tmic">
+        <ctl name="VA_CDC_DMA_TX_0 Channels" value="Three" />
+        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
+        <ctl name="VA_AIF1_CAP Mixer DEC1" value="1" />
+        <ctl name="VA_AIF1_CAP Mixer DEC2" value="1" />
         <ctl name="VA DEC0 MUX" value="MSM_DMIC" />
         <ctl name="VA DEC1 MUX" value="MSM_DMIC" />
+        <ctl name="VA DEC2 MUX" value="MSM_DMIC" />
         <ctl name="VA DMIC MUX0" value="DMIC1" />
         <ctl name="VA DMIC MUX1" value="DMIC2" />
+        <ctl name="VA DMIC MUX2" value="DMIC5" />
+    </path>
+
+    <path name="listen-ape-handset-qmic">
+        <ctl name="VA_CDC_DMA_TX_0 Channels" value="Four" />
+        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
+        <ctl name="VA_AIF1_CAP Mixer DEC1" value="1" />
+        <ctl name="VA_AIF1_CAP Mixer DEC2" value="1" />
+        <ctl name="VA_AIF1_CAP Mixer DEC3" value="1" />
+        <ctl name="VA DEC0 MUX" value="MSM_DMIC" />
+        <ctl name="VA DEC1 MUX" value="MSM_DMIC" />
+        <ctl name="VA DEC2 MUX" value="MSM_DMIC" />
+        <ctl name="VA DEC3 MUX" value="MSM_DMIC" />
+        <ctl name="VA DMIC MUX0" value="DMIC1" />
+        <ctl name="VA DMIC MUX1" value="DMIC2" />
+        <ctl name="VA DMIC MUX2" value="DMIC3" />
+        <ctl name="VA DMIC MUX3" value="DMIC5" />
     </path>
 
     <path name="listen-ape-headset-mic">
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 6a8e253..293de78 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -100,6 +100,38 @@ vendor/lib/libhdmipassthru.so
 vendor/lib/libqtigef.so
 vendor/lib64/libadsprpc.so
 
+# Audio LVIMFS
+odm/lib/lib_lvacfs.so
+odm/lib/liblvacfs_wrapper.so
+
+# Audio LVIMFS - from DE2117_11.C.34
+odm/etc/lvimfs_params/LVACFS_Configuration.txt|024b3814ee9d35b2954c253ae1a25311d4724902
+odm/etc/lvimfs_params/LVIMFS_Calibration_2mic.dat|ae8a5e7c7ee1a036ebf19a93d0e4e6ad804421ed
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID1_MIC_Normal.txt|b3ba0a1e4330ab2c06ed91935775d73410f95e75
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID2_MIC_APP1.txt|9c4c252c1d3b8e0d408436493e23456c5d1cac02
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID3_MIC_APP2.txt|49a5e51773d6e914760bc63e120b8dccc665e3fc
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID4_MIC_Cam.txt|51755c45956e874f16cf32864997b37fb8118ae0
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID5_MIC_Conference.txt|86cec8aefc159025764de1c973f355b18f28f99d
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID6_MIC_Fast.txt|79ae2eeca0a57e6bec03b89ad5643f59f4bb4c81
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID7_MIC_Interview.txt|80da5955012e93d6c50678a42afc6338957ccd85
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID8_MIC_Unprocess.txt|9f6c9bf974df7bb44569f0c907ffdf12278d9ff4
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID9_MIC_Voice.txt|58d97be976f0af53c8e917bbc183c97e880c0ef6
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID10_MIC_VR.txt|58d97be976f0af53c8e917bbc183c97e880c0ef6
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID11_HE.txt|cf5511dfe48fa689b264f6acb243b472ab77f952
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID12_HE_APP1.txt|9f20523bd98f93113e5638593bac65102d128cf5
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID13_HE_APP2.txt|127971b4a69960ad59dae3a7fb2142d0a698ef15
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID14_HE_Cam.txt|2801ccb5a315e020ae88d279517310c64ebd3555
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID15_HE_Conference.txt|a9f52a40c3cc5d9e69e4e7d01cbe31848b6baa13
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID16_HE_Fast.txt|80d912cc493fcdcae4df2812b86d7e600f44b9ce
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID17_HE_Interview.txt|77b9bcdd3d03341b8c789a1fc46686988d77d232
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID18_HE_Unprocess.txt|ce88b46719190c7605ab3300d2d88121f7709c47
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID19_HE_Voice.txt|cf5511dfe48fa689b264f6acb243b472ab77f952
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID20_HE_VR.txt|17d73bdbe846e10e221f24ebf4266b070a9ba29d
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID21_USB_Normal.txt|d71c71902cd0690fc427c151351c063a61065f87
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID22_USB_APP1.txt|4afab240183e10e0dfabe44c68d3f96286046233
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID23_BT_Normal.txt|4afab240183e10e0dfabe44c68d3f96286046233
+odm/etc/lvimfs_params/LVIMFS_Parameter_ID24_BT_APP1.txt|d06f245cc25a70b556100af2d38638d0251feb0e
+
 # Bluetooth - from LE2125_14.0.0.720(EX01)
 vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti|801aeb458a8d7fbbf56599981ae0c3a1bcf9d32a
 vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc|ebf60c17d1fbd737c6f6b043241e2ce18b3fcaa1