diff --git a/audio/audio_platform_info_yupikidp.xml b/audio/audio_platform_info_yupikidp.xml
index 2416141..7deda67 100644
--- a/audio/audio_platform_info_yupikidp.xml
+++ b/audio/audio_platform_info_yupikidp.xml
@@ -82,8 +82,8 @@
         <usecase name="USECASE_VOWLAN_CALL" type="out" id="-1"/>
         <usecase name="USECASE_AUDIO_PLAYBACK_FM" type="out" id="30"/>
         <usecase name="USECASE_AUDIO_PLAYBACK_FM" type="in" id="44"/>
-        <usecase name="USECASE_AUDIO_SPKR_CALIB_RX" type="out" id="46"/>
-        <usecase name="USECASE_AUDIO_SPKR_CALIB_TX" type="in" id="47"/>
+        <usecase name="USECASE_AUDIO_SPKR_CALIB_RX" type="out" id="30"/>
+        <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"/>
@@ -100,7 +100,6 @@
         <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="in" id="36" />
         <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="out" id="36" />
         <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="23" />
-        <usecase name="USECASE_INCALL_MUSIC_UPLINK2" type="out" id="23" />
         <usecase name="USECASE_AUDIO_RECORD_COMPRESS2" type="in" id="37" />
         <usecase name="USECASE_AUDIO_PLAYBACK_WITH_HAPTICS" type="out" id="40" />
         <usecase name="USECASE_AUDIO_PLAYBACK_HAPTICS" type="out" id="41" />
@@ -143,8 +142,8 @@
         <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK_MONO_1" acdb_id="151"/>
         <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK_MONO_2" acdb_id="152"/>
         <device name="SND_DEVICE_IN_UNPROCESSED_USB_HEADSET_MIC" acdb_id="133"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_1" acdb_id="15"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_2" acdb_id="15"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_1" acdb_id="14"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_2" acdb_id="14"/>
         <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP" acdb_id="15"/>
         <device name="SND_DEVICE_OUT_SPEAKER_AND_HDMI" acdb_id="15"/>
         <device name="SND_DEVICE_OUT_SPEAKER_AND_DISPLAY_PORT" acdb_id="15"/>
@@ -173,10 +172,10 @@
         <device name="SND_DEVICE_OUT_BT_A2DP" backend="bt-a2dp" interface="SLIMBUS_7_RX"/>
         <device name="SND_DEVICE_OUT_LINE" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" interface="QUIN_MI2S_RX-and-RX_CDC_DMA_RX_0"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_HIFI_FILTER" backend="speaker-and-headphones" interface="QUIN_MI2S_RX-and-RX_CDC_DMA_RX_0"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_AND_LINE" backend="speaker-and-headphones" interface="QUIN_MI2S_RX-and-RX_CDC_DMA_RX_0"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-and-headphones" interface="QUIN_MI2S_RX-and-RX_CDC_DMA_RX_0"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" interface="PRI_MI2S_RX-and-RX_CDC_DMA_RX_0"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_HIFI_FILTER" backend="speaker-and-headphones" interface="PRI_MI2S_RX-and-RX_CDC_DMA_RX_0"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_LINE" backend="speaker-and-headphones" interface="PRI_MI2S_RX-and-RX_CDC_DMA_RX_0"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-and-headphones" interface="PRI_MI2S_RX-and-RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_VOICE_HEADSET" backend="headset" interface="RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_VOICE_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
@@ -185,42 +184,42 @@
         <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADSET" backend="headset" interface="RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADSET" backend="headset" interface="RX_CDC_DMA_RX_0"/>
-        <device name="SND_DEVICE_OUT_HANDSET" backend="handset" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_SPEAKER" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_CAPTURE_VI_FEEDBACK" interface="QUIN_MI2S_TX"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_1" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_2" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_VBAT" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1" interface="QUIN_MI2S_RX-and-RX_CDC_DMA_RX_0"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2" interface="QUIN_MI2S_RX-and-RX_CDC_DMA_RX_0"/>
-        <device name="SND_DEVICE_OUT_VOICE_HANDSET" backend="handset" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_VOICE_HANDSET_TMUS" backend="handset" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_VOICE_HAC_HANDSET" backend="hac-handset" interface="RX_CDC_DMA_RX_1"/>
+        <device name="SND_DEVICE_OUT_HANDSET" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_SPEAKER" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_1" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_2" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_VBAT" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1" interface="PRI_MI2S_RX-and-RX_CDC_DMA_RX_0"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2" interface="PRI_MI2S_RX-and-RX_CDC_DMA_RX_0"/>
+        <device name="SND_DEVICE_OUT_VOICE_HANDSET" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_VOICE_HANDSET_TMUS" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_VOICE_HAC_HANDSET" interface="PRI_MI2S_RX"/>
         <device name="SND_DEVICE_IN_HANDSET_GENERIC_QMIC" interface="TX_CDC_DMA_TX_3"/>
-        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED_VBAT" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_VBAT" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_AND_HDMI" interface="QUIN_MI2S_RX-and-HDMI"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_AND_DISPLAY_PORT" interface="QUIN_MI2S_RX-and-DISPLAY_PORT"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP" interface="QUIN_MI2S_RX-and-SLIMBUS_7_RX"/>
-        <device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" interface="QUIN_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_VBAT" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_HDMI" interface="PRI_MI2S_RX-and-HDMI"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_DISPLAY_PORT" interface="PRI_MI2S_RX-and-DISPLAY_PORT"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP" interface="PRI_MI2S_RX-and-SLIMBUS_7_RX"/>
+        <device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" interface="PRI_MI2S_RX"/>
         <device name="SND_DEVICE_OUT_ANC_FB_HEADSET" interface="RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_VOICE_ANC_FB_HEADSET" interface="RX_CDC_DMA_RX_0"/>
-        <device name="SND_DEVICE_OUT_ANC_HANDSET" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_WSA" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_WSA" interface="QUIN_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_WSA" interface="QUIN_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_ANC_HANDSET" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED_VBAT" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_WSA" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_WSA" interface="PRI_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_WSA" interface="PRI_MI2S_RX"/>
         <device name="SND_DEVICE_IN_HANDSET_MIC" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_HANDSET_MIC_SB" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_HANDSET_MIC_EXTERNAL" interface="TX_CDC_DMA_TX_3"/>
@@ -296,11 +295,11 @@
         <device name="SND_DEVICE_IN_VOICE_REC_DMIC_FLUENCE" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_AANC_HANDSET_MIC" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_QUAD_MIC" 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_DMIC_STEREO" interface="TX_CDC_DMA_TX_3"/>
-        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK" interface="QUIN_MI2S_TX"/>
-        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK_MONO_1" interface="QUIN_MI2S_TX"/>
-        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK_MONO_2" interface="QUIN_MI2S_TX"/>
+        <device name="SND_DEVICE_IN_HANDSET_STEREO_DMIC" 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_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"/>
         <device name="SND_DEVICE_IN_SPEAKER_DMIC_BROADSIDE" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_BROADSIDE" interface="TX_CDC_DMA_TX_3"/>
@@ -319,19 +318,16 @@
         <device name="SND_DEVICE_IN_HANDSET_TMIC_AEC" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_HANDSET_TMIC_NS" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_HANDSET_TMIC_AEC_NS" interface="TX_CDC_DMA_TX_3"/>
-        <device name="SND_DEVICE_IN_SPEAKER_TMIC_AEC" interface="TX_CDC_DMA_TX_3"/>
-        <device name="SND_DEVICE_IN_SPEAKER_TMIC_NS" interface="TX_CDC_DMA_TX_3"/>
-        <device name="SND_DEVICE_IN_SPEAKER_TMIC_AEC_NS" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_VOICE_REC_TMIC" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_UNPROCESSED_MIC" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_UNPROCESSED_STEREO_MIC" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_UNPROCESSED_THREE_MIC" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_UNPROCESSED_QUAD_MIC" interface="TX_CDC_DMA_TX_3"/>
-        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES" backend="speaker-and-headphones" interface="QUIN_MI2S_RX-and-RX_CDC_DMA_RX_0"/>
-        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET" backend="speaker-and-headphones" interface="QUIN_MI2S_RX-and-RX_CDC_DMA_RX_0"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO" backend="speaker-and-bt-sco" interface="QUIN_MI2S_RX-and-SLIMBUS_7_RX"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="QUIN_MI2S_RX-and-SLIMBUS_7_RX"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_SWB" backend="speaker-and-bt-sco-swb" interface="QUIN_MI2S_RX-and-SLIMBUS_7_RX"/>
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES" backend="speaker-and-headphones" interface="PRI_MI2S_RX-and-RX_CDC_DMA_RX_0"/>
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET" backend="speaker-and-headphones" interface="PRI_MI2S_RX-and-RX_CDC_DMA_RX_0"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO" backend="speaker-and-bt-sco" interface="PRI_MI2S_RX-and-SLIMBUS_7_RX"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="PRI_MI2S_RX-and-SLIMBUS_7_RX"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_SWB" backend="speaker-and-bt-sco-swb" interface="PRI_MI2S_RX-and-SLIMBUS_7_RX"/>
         <device name="SND_DEVICE_OUT_HEADPHONES_DSD" backend="headphones-dsd" interface="RX_CDC_DMA_RX_5"/>
     </backend_names>
     <!-- below values are for ref purpose to OEM, doesn't contain actual hardware info on MTP -->
diff --git a/audio/mixer_paths_yupikidp.xml b/audio/mixer_paths_yupikidp.xml
index 6403f7c..5f36a69 100644
--- a/audio/mixer_paths_yupikidp.xml
+++ b/audio/mixer_paths_yupikidp.xml
@@ -26,10 +26,6 @@
 <!--- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN    -->
 <!--- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                             -->
 <mixer>
-    <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="Voice Rx Device Mute" id="0" value="0"/>
     <ctl name="Voice Rx Device Mute" id="1" value="-1"/>
     <ctl name="Voice Rx Device Mute" id="2" value="20"/>
@@ -108,20 +104,19 @@
     <ctl name="DISPLAY_PORT1 Mixer MultiMedia14" value="0"/>
     <ctl name="DISPLAY_PORT1 Mixer MultiMedia15" value="0"/>
     <ctl name="DISPLAY_PORT1 Mixer MultiMedia16" value="0"/>
-    <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia1" value="0"/>
-    <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia2" value="0"/>
-    <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia3" value="0"/>
-    <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia4" value="0"/>
-    <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia5" value="0"/>
-    <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia7" value="0"/>
-    <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia8" value="0"/>
-    <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia10" value="0"/>
-    <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia11" value="0"/>
-    <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia12" value="0"/>
-    <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia13" value="0"/>
-    <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia14" value="0"/>
-    <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia15" value="0"/>
-    <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia16" value="0"/>
+    <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="0"/>
+    <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia2" value="0"/>
+    <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia3" value="0"/>
+    <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia4" value="0"/>
+    <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia5" value="0"/>
+    <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia7" value="0"/>
+    <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia8" value="0"/>
+    <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="0"/>
+    <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia11" value="0"/>
+    <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia12" value="0"/>
+    <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia13" value="0"/>
+    <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia14" value="0"/>
+    <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia15" value="0"/>
     <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="0"/>
     <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="0"/>
     <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia2" value="0"/>
@@ -157,22 +152,19 @@
     <ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="0"/>
     <ctl name="MultiMedia17 Mixer USB_AUDIO_TX" value="0"/>
     <ctl name="TX_CDC_DMA_TX_3 Channels" value="One"/>
-    <ctl name="QUIN_MI2S_RX Channels" value="Two"/>
-    <ctl name="QUIN_MI2S_TX Channels" value="Two"/>
+    <ctl name="WSA_CDC_DMA_RX_0 Channels" value="One"/>
     <ctl name="RX_CDC_DMA_RX_0 Channels" value="One"/>
+    <ctl name="VI_FEED_TX Channels" value="Two"/>
     <ctl name="TX LPI Enable" value="0"/>
     <ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_1" value="0"/>
     <ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_2" value="0"/>
-    <ctl name="QUIN_MI2S_RX Format" value="S32_LE"/>
-    <ctl name="QUIN_MI2S_TX Format" value="S32_LE"/>
-    <ctl name="QUIN_MI2S_RX SampleRate" value="KHZ_48"/>
-    <ctl name="QUIN_MI2S_TX SampleRate" value="KHZ_48"/>
+    <ctl name="WSA_CDC_DMA_RX_0 Format" value="S16_LE"/>
     <ctl name="WSA_CDC_DMA_TX_0 Format" value="S16_LE"/>
     <ctl name="RX_CDC_DMA_RX_0 Format" value="S16_LE"/>
     <ctl name="TX_CDC_DMA_TX_3 Format" value="S16_LE"/>
     <ctl name="WSA_CDC_DMA_TX_0 SampleRate" value="KHZ_48"/>
     <ctl name="HFP_SLIM7_UL_HL Switch" value="0"/>
-    <ctl name="QUIN_MI2S_RX Port Mixer SLIM_7_TX" value="0"/>
+    <ctl name="WSA_CDC_DMA_RX_0 Port Mixer SLIM_7_TX" value="0"/>
     <ctl name="RX_CDC_DMA_RX_0 Port Mixer SLIM_7_TX" value="0"/>
     <ctl name="AUDIO_REF_EC_UL1 MUX" value="None"/>
     <ctl name="AUDIO_REF_EC_UL10 MUX" value="None"/>
@@ -191,13 +183,13 @@
     <ctl name="MultiMedia1 Mixer AFE_PCM_TX" value="0"/>
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="0"/>
     <ctl name="Tert MI2S LOOPBACK Volume" value="0"/>
-    <ctl name="QUIN_MI2S_RX Port Mixer TERT_MI2S_TX" value="0"/>
-    <ctl name="QUIN_MI2S_RX_DL_HL Switch" value="0"/>
+    <ctl name="WSA_CDC_DMA_RX_0 Port Mixer TERT_MI2S_TX" value="0"/>
+    <ctl name="WSA_CDC_DMA_RX_0_DL_HL Switch" value="0"/>
     <ctl name="RX_CDC_DMA_RX_0 Port Mixer TERT_MI2S_TX" value="0"/>
     <ctl name="RX_CDC_DMA_RX_0_DL_HL Switch" value="0"/>
     <ctl name="MultiMedia1 Mixer TERT_MI2S_TX" value="0"/>
     <ctl name="MultiMedia2 Mixer TERT_MI2S_TX" value="0"/>
-    <ctl name="QUIN_MI2S_RX_Voice Mixer VoiceMMode1" value="0"/>
+    <ctl name="WSA_CDC_DMA_RX_0_Voice Mixer VoiceMMode1" value="0"/>
     <ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode1" value="0"/>
     <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="0"/>
     <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_4_MMode1" value="0"/>
@@ -210,7 +202,7 @@
     <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode1" value="0"/>
     <ctl name="PROXY_RX_Voice Mixer VoiceMMode1" value="0"/>
     <ctl name="VoiceMMode1_Tx Mixer PROXY_TX_MMode1" value="0"/>
-    <ctl name="QUIN_MI2S_RX_Voice Mixer VoiceMMode2" value="0"/>
+    <ctl name="WSA_CDC_DMA_RX_0_Voice Mixer VoiceMMode2" value="0"/>
     <ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode2" value="0"/>
     <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="0"/>
     <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_4_MMode2" value="0"/>
@@ -232,7 +224,7 @@
     <ctl name="MultiMedia8 Mixer VOC_REC_DL" value="0"/>
     <ctl name="Incall_Music Audio Mixer MultiMedia2" value="0"/>
     <ctl name="Incall_Music Audio Mixer MultiMedia9" value="0"/>
-    <ctl name="QUIN_MI2S_RX_Voice Mixer Voip" value="0"/>
+    <ctl name="WSA_CDC_DMA_RX_0_Voice Mixer Voip" value="0"/>
     <ctl name="RX_CDC_DMA_RX_0_Voice Mixer Voip" value="0"/>
     <ctl name="Voip_Tx Mixer TX_CDC_DMA_TX_3_Voip" value="0"/>
     <ctl name="Voip_Tx Mixer TX_CDC_DMA_TX_4_Voip" value="0"/>
@@ -254,7 +246,6 @@
     <ctl name="WSA_RX1 INP0" value="ZERO"/>
     <ctl name="WSA_RX_0_VI_FB_LCH_MUX" value="ZERO"/>
     <ctl name="WSA_RX_0_VI_FB_RCH_MUX" value="ZERO"/>
-    <ctl name="QUIN_MI2S_RX_VI_FB_MUX" value="ZERO"/>
     <ctl name="SpkrLeft COMP Switch" value="0"/>
     <ctl name="SpkrRight COMP Switch" value="0"/>
     <ctl name="SpkrLeft VISENSE Switch" value="0"/>
@@ -335,7 +326,10 @@
     <ctl name="HPHL Volume" value="20"/>
     <ctl name="HPHR Volume" value="20"/>
     <ctl name="EAR SPKR PA Gain" value="G_DEFAULT"/>
-    <ctl name="HAC_PA Switch" value="0"/>
+    <ctl name="TX_DEC0 Volume" value="84"/>
+    <ctl name="TX_DEC1 Volume" value="84"/>
+    <ctl name="TX_DEC2 Volume" value="84"/>
+    <ctl name="TX_DEC3 Volume" value="84"/>
     <ctl name="TX_DEC4 Volume" value="84"/>
     <ctl name="TX_DEC5 Volume" value="84"/>
     <ctl name="TX_DEC6 Volume" value="84"/>
@@ -396,7 +390,7 @@
     <ctl name="MultiMedia16 Mixer USB_AUDIO_TX" value="0"/>
     <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="0"/>
     <ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="0"/>
-    <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia31" value="0"/>
+    <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="0"/>
     <ctl name="RX_CDC_DMA_RX_6 Channels" value="One"/>
     <ctl name="TX0 MODE" value="ADC_LP"/>
     <ctl name="TX1 MODE" value="ADC_LP"/>
@@ -456,7 +450,30 @@
     <ctl name="RX INT2_1 VBAT RX AUX VBAT Enable" value="0"/>
     <ctl name="MultiMedia16 Mixer SLIM_8_TX" value="0"/>
     <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia31" value="0"/>
-    <ctl name="VI_FEED_TX Channels" value="One"/>
+    <ctl name="PRIM_MI2S_RX Channels" value="Two"/>
+    <ctl name="PRIM_MI2S_RX Format" value="S32_LE"/>
+    <ctl name="PRIM_MI2S_TX Channels" value="Two"/>
+    <ctl name="PRIM_MI2S_TX Format" value="S32_LE"/>
+    <ctl name="PRI_MI2S_RX Port Mixer SLIM_7_TX" value="0"/>
+    <ctl name="PRI_MI2S_RX Port Mixer TERT_MI2S_TX" value="0"/>
+    <ctl name="PRI_MI2S_RX_DL_HL Switch" value="0"/>
+    <ctl name="PRI_MI2S_RX_Voice Mixer VoiceMMode1" value="0"/>
+    <ctl name="PRI_MI2S_RX_Voice Mixer VoiceMMode2" value="0"/>
+    <ctl name="PRI_MI2S_RX_Voice Mixer Voip" value="0"/>
+    <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia1" value="0"/>
+    <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia2" value="0"/>
+    <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia3" value="0"/>
+    <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia4" value="0"/>
+    <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia5" value="0"/>
+    <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia7" value="0"/>
+    <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia8" value="0"/>
+    <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia10" value="0"/>
+    <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia11" value="0"/>
+    <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia12" value="0"/>
+    <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia13" value="0"/>
+    <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia14" value="0"/>
+    <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia15" value="0"/>
+    <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia31" value="0"/>
     <ctl name="TX DEC0 MUX" value="MSM_DMIC"/>
     <ctl name="TX DEC1 MUX" value="MSM_DMIC"/>
     <ctl name="TX DEC2 MUX" value="MSM_DMIC"/>
@@ -465,37 +482,35 @@
     <ctl name="TX DEC5 MUX" value="MSM_DMIC"/>
     <ctl name="TX DEC6 MUX" value="MSM_DMIC"/>
     <ctl name="TX DEC7 MUX" value="MSM_DMIC"/>
-    <ctl name="TX_DEC0 Volume" value="84"/>
-    <ctl name="TX_DEC1 Volume" value="84"/>
-    <ctl name="TX_DEC2 Volume" value="84"/>
-    <ctl name="TX_DEC3 Volume" value="84"/>
     <ctl name="MultiMedia1 Mixer SEC_MI2S_TX" value="0"/>
     <ctl name="MultiMedia2 Mixer SEC_MI2S_TX" value="0"/>
     <ctl name="MultiMedia8 Mixer SEC_MI2S_TX" value="0"/>
     <ctl name="MultiMedia16 Mixer SEC_MI2S_TX" value="0"/>
     <ctl name="SEC MI2S LOOPBACK Volume" value="0"/>
-    <ctl name="QUIN_MI2S_RX Port Mixer SEC_MI2S_TX" value="0"/>
-    <path name="amic5">
-        <ctl name="TX DEC1 MUX" value="SWR_MIC"/>
-        <ctl name="TX SMIC MUX1" value="SWR_MIC5"/>
-        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/>
-        <ctl name="ADC4 ChMap" value="SWRM_TX2_CH2"/>
-        <ctl name="ADC4_MIXER Switch" value="1"/>
-        <ctl name="ADC4 MUX" value="INP5"/>
-    </path>
+    <ctl name="WSA_CDC_DMA_RX_0 Port Mixer SEC_MI2S_TX" value="0"/>
+    <ctl name="MultiMedia1 Mixer PRI_MI2S_TX" value="0"/>
+    <ctl name="MultiMedia17 Mixer PRI_MI2S_TX" value="0"/>
+    <path name="speaker-and-haptics"/>
     <path name="gsm-mode">
         <ctl name="GSM mode Enable" value="ON"/>
     </path>
     <path name="tx-lpi-enable">
         <ctl name="TX LPI Enable" value="1"/>
     </path>
+    <path name="echo-reference">
+        <ctl name="AUDIO_REF_EC_UL10 MUX" value="I2S_RX"/>
+        <ctl name="EC Reference Channels" value="Two"/>
+    </path>
+    <path name="echo-reference handset">
+        <ctl name="AUDIO_REF_EC_UL10 MUX" value="I2S_RX"/>
+        <ctl name="EC Reference Channels" value="One"/>
+    </path>
     <path name="echo-reference headphones">
         <ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_0"/>
         <ctl name="EC Reference Channels" value="Two"/>
     </path>
     <path name="echo-reference headset">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_0"/>
-        <ctl name="EC Reference Channels" value="Two"/>
+        <path name="echo-reference headphones"/>
     </path>
     <path name="echo-reference display-port">
         <ctl name="AUDIO_REF_EC_UL1 MUX" value="DISPLAY_PORT"/>
@@ -518,11 +533,15 @@
     <path name="echo-reference bt-sco-swb">
         <path name="echo-reference bt-sco"/>
     </path>
-    <path name="echo-reference-voip-low-latency headphones">
-        <ctl name="AUDIO_REF_EC_UL8 MUX" value="RX_CDC_DMA_RX_0"/>
+    <path name="echo-reference-voip-low-latency">
+        <ctl name="AUDIO_REF_EC_UL8 MUX" value="PRI_MI2S_RX"/>
         <ctl name="EC Reference Channels" value="Two"/>
     </path>
-    <path name="echo-reference-voip-low-latency headset">
+    <path name="echo-reference-voip-low-latency handset">
+        <ctl name="AUDIO_REF_EC_UL8 MUX" value="PRI_MI2S_RX"/>
+        <ctl name="EC Reference Channels" value="One"/>
+    </path>
+    <path name="echo-reference-voip-low-latency headphones">
         <ctl name="AUDIO_REF_EC_UL8 MUX" value="RX_CDC_DMA_RX_0"/>
         <ctl name="EC Reference Channels" value="Two"/>
     </path>
@@ -536,26 +555,18 @@
     <path name="echo-reference-voip-low-latency bt-sco-swb">
         <path name="echo-reference-voip-low-latency bt-sco"/>
     </path>
+    <path name="echo-reference-voip">
+        <ctl name="AUDIO_REF_EC_UL10 MUX" value="I2S_RX"/>
+        <ctl name="EC Reference Channels" value="Two"/>
+    </path>
+    <path name="echo-reference-voip handset">
+        <ctl name="AUDIO_REF_EC_UL10 MUX" value="I2S_RX"/>
+        <ctl name="EC Reference Channels" value="One"/>
+    </path>
     <path name="echo-reference-voip headphones">
         <ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_0"/>
         <ctl name="EC Reference Channels" value="Two"/>
     </path>
-    <path name="echo-reference-voip headset">
-        <ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_0"/>
-        <ctl name="EC Reference Channels" value="Two"/>
-    </path>
-    <path name="echo-reference-voip usb-headphones">
-        <ctl name="AUDIO_REF_EC_UL10 MUX" value="USB_AUDIO_RX"/>
-        <ctl name="EC Reference Channels" value="Two"/>
-    </path>
-    <path name="echo-reference usb-headphones">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="USB_AUDIO_RX"/>
-        <ctl name="EC Reference Channels" value="Two"/>
-    </path>
-    <path name="echo-reference-voip-low-latency usb-headphones">
-        <ctl name="AUDIO_REF_EC_UL8 MUX" value="USB_AUDIO_RX"/>
-        <ctl name="EC Reference Channels" value="Two"/>
-    </path>
     <path name="echo-reference-voip bt-sco">
         <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_7_RX"/>
         <ctl name="EC Reference Channels" value="Two"/>
@@ -567,7 +578,7 @@
         <path name="echo-reference-voip bt-sco"/>
     </path>
     <path name="deep-buffer-playback">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia1" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia1" value="1"/>
     </path>
     <path name="deep-buffer-playback speaker-protected">
         <path name="deep-buffer-playback"/>
@@ -650,7 +661,7 @@
         <path name="deep-buffer-playback"/>
     </path>
     <path name="low-latency-playback">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia5" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia5" value="1"/>
     </path>
     <path name="low-latency-playback speaker-protected">
         <path name="low-latency-playback"/>
@@ -736,7 +747,7 @@
         <path name="low-latency-playback"/>
     </path>
     <path name="audio-ull-playback">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia8" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia8" value="1"/>
     </path>
     <path name="audio-ull-playback speaker-protected">
         <path name="audio-ull-playback"/>
@@ -824,7 +835,7 @@
         <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1"/>
     </path>
     <path name="compress-offload-playback">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia4" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia4" value="1"/>
     </path>
     <path name="compress-offload-playback speaker-protected">
         <path name="compress-offload-playback"/>
@@ -919,7 +930,7 @@
         <path name="compress-offload-playback"/>
     </path>
     <path name="compress-offload-playback2">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia7" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia7" value="1"/>
     </path>
     <path name="compress-offload-playback2 display-port">
         <ctl name="DISPLAY_PORT Mixer MultiMedia7" value="1"/>
@@ -1002,7 +1013,7 @@
         <path name="compress-offload-playback2"/>
     </path>
     <path name="compress-offload-playback3">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia10" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia10" value="1"/>
     </path>
     <path name="compress-offload-playback3 display-port">
         <ctl name="DISPLAY_PORT Mixer MultiMedia10" value="1"/>
@@ -1069,7 +1080,7 @@
         <path name="compress-offload-playback3"/>
     </path>
     <path name="compress-offload-playback4">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia11" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia11" value="1"/>
     </path>
     <path name="compress-offload-playback4 display-port">
         <ctl name="DISPLAY_PORT Mixer MultiMedia11" value="1"/>
@@ -1136,7 +1147,7 @@
         <path name="compress-offload-playback4"/>
     </path>
     <path name="compress-offload-playback5">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia12" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia12" value="1"/>
     </path>
     <path name="compress-offload-playback5 display-port">
         <ctl name="DISPLAY_PORT Mixer MultiMedia12" value="1"/>
@@ -1203,7 +1214,7 @@
         <path name="compress-offload-playback5"/>
     </path>
     <path name="compress-offload-playback6">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia13" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia13" value="1"/>
     </path>
     <path name="compress-offload-playback6 display-port">
         <ctl name="DISPLAY_PORT Mixer MultiMedia13" value="1"/>
@@ -1270,7 +1281,7 @@
         <path name="compress-offload-playback6"/>
     </path>
     <path name="compress-offload-playback7">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia14" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia14" value="1"/>
     </path>
     <path name="compress-offload-playback7 display-port">
         <ctl name="DISPLAY_PORT Mixer MultiMedia14" value="1"/>
@@ -1337,7 +1348,7 @@
         <path name="compress-offload-playback7"/>
     </path>
     <path name="compress-offload-playback8">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia15" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia15" value="1"/>
     </path>
     <path name="compress-offload-playback8 display-port">
         <ctl name="DISPLAY_PORT Mixer MultiMedia15" value="1"/>
@@ -1404,7 +1415,7 @@
         <path name="compress-offload-playback8"/>
     </path>
     <path name="compress-offload-playback9">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia16" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia16" value="1"/>
     </path>
     <path name="compress-offload-playback9 display-port">
         <ctl name="DISPLAY_PORT Mixer MultiMedia16" value="1"/>
@@ -1696,7 +1707,7 @@
         <path name="hfp-sco headphones"/>
     </path>
     <path name="compress-voip-call">
-        <ctl name="QUIN_MI2S_RX_Voice Mixer Voip" value="1"/>
+        <ctl name="PRI_MI2S_RX_Voice Mixer Voip" value="1"/>
         <ctl name="Voip_Tx Mixer TX_CDC_DMA_TX_3_Voip" value="1"/>
     </path>
     <path name="compress-voip-call bt-a2dp">
@@ -1743,24 +1754,7 @@
         <path name="compress-voip-call"/>
     </path>
     <path name="voicemmode1-call">
-        <ctl name="VOC_EXT_EC MUX" value="QUIN_MI2S_RX"/>
-        <ctl name="QUIN_MI2S_RX Channels" value="Two"/>
-        <ctl name="QUIN_MI2S_TX Channels" value="two"/>
-        <ctl name="QUIN_MI2S_RX_Voice Mixer VoiceMMode1" value="1"/>
-        <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1"/>
-    </path>
-    <path name="voicemmode1-call speaker">
-        <ctl name="VOC_EXT_EC MUX" value="QUIN_MI2S_RX"/>
-        <ctl name="QUIN_MI2S_RX Channels" value="Two"/>
-        <ctl name="QUIN_MI2S_TX Channels" value="two"/>
-        <ctl name="QUIN_MI2S_RX_Voice Mixer VoiceMMode1" value="1"/>
-        <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1"/>
-    </path>
-    <path name="voicemmode1-call voice-speaker">
-        <ctl name="VOC_EXT_EC MUX" value="QUIN_MI2S_RX"/>
-        <ctl name="QUIN_MI2S_RX Channels" value="Two"/>
-        <ctl name="QUIN_MI2S_TX Channels" value="two"/>
-        <ctl name="QUIN_MI2S_RX_Voice Mixer VoiceMMode1" value="1"/>
+        <ctl name="PRI_MI2S_RX_Voice Mixer VoiceMMode1" value="1"/>
         <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1"/>
     </path>
     <path name="voicemmode1-call hearing-aid">
@@ -1827,18 +1821,7 @@
         <path name="voicemmode1-call"/>
     </path>
     <path name="voicemmode2-call">
-        <ctl name="VOC_EXT_EC MUX" value="QUIN_MI2S_RX"/>
-        <ctl name="QUIN_MI2S_RX_Voice Mixer VoiceMMode2" value="1"/>
-        <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1"/>
-    </path>
-    <path name="voicemmode2-call speaker">
-        <ctl name="VOC_EXT_EC MUX" value="QUIN_MI2S_RX"/>
-        <ctl name="QUIN_MI2S_RX_Voice Mixer VoiceMMode2" value="1"/>
-        <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1"/>
-    </path>
-    <path name="voicemmode2-call voice-speaker">
-        <ctl name="VOC_EXT_EC MUX" value="QUIN_MI2S_RX"/>
-        <ctl name="QUIN_MI2S_RX_Voice Mixer VoiceMMode2" value="1"/>
+        <ctl name="PRI_MI2S_RX_Voice Mixer VoiceMMode2" value="1"/>
         <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1"/>
     </path>
     <path name="voicemmode2-call headphones">
@@ -1905,7 +1888,7 @@
         <path name="voicemmode2-call"/>
     </path>
     <path name="audio-playback-voip">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia10" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia10" value="1"/>
     </path>
     <path name="audio-playback-voip headphones">
         <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="1"/>
@@ -1985,14 +1968,12 @@
         <ctl name="MultiMedia10 Mixer TX_CDC_DMA_TX_4" value="1"/>
     </path>
     <path name="spkr-rx-calib">
-        <ctl name="QUIN_MI2S_RX_DL_HL Switch" value="1"/>
+        <ctl name="PRI_MI2S_RX_DL_HL Switch" value="1"/>
     </path>
-    <path name="spkr-vi-record">
-        <ctl name="QUIN_MI2S_RX_VI_FB_MUX" value="QUIN_MI2S_TX"/>
-    </path>
+    <path name="spkr-vi-record"/>
     <path name="audio-with-haptics-playback">
         <ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
     </path>
     <path name="audio-with-haptics-playback speaker-protected">
         <path name="audio-with-haptics-playback"/>
@@ -2020,11 +2001,11 @@
     </path>
     <path name="audio-with-haptics-playback speaker-and-display-port">
         <path name="audio-with-haptics-playback display-port"/>
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
     </path>
     <path name="audio-with-haptics-playback speaker-and-display-port1">
         <path name="audio-with-haptics-playback display-port1"/>
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
     </path>
     <path name="audio-with-haptics-playback afe-proxy">
         <ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
@@ -2040,11 +2021,11 @@
     </path>
     <path name="audio-with-haptics-playback speaker-and-usb-headphones">
         <path name="audio-with-haptics-playback usb-headphones"/>
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
     </path>
     <path name="audio-with-haptics-playback speaker-safe-and-usb-headphones">
         <path name="audio-with-haptics-playback usb-headphones"/>
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
     </path>
     <path name="audio-with-haptics-playback headphones">
         <ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
@@ -2055,31 +2036,31 @@
     </path>
     <path name="audio-with-haptics-playback speaker-and-headphones">
         <path name="audio-with-haptics-playback headphones"/>
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
     </path>
     <path name="audio-with-haptics-playback speaker-safe-and-headphones">
         <path name="audio-with-haptics-playback headphones"/>
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
     </path>
     <path name="audio-with-haptics-playback speaker-and-bt-sco">
         <path name="audio-with-haptics-playback bt-sco"/>
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
     </path>
     <path name="audio-with-haptics-playback speaker-safe-and-bt-sco">
         <path name="audio-with-haptics-playback bt-sco"/>
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
     </path>
     <path name="audio-with-haptics-playback speaker-and-bt-sco-wb">
         <path name="audio-with-haptics-playback bt-sco-wb"/>
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
     </path>
     <path name="audio-with-haptics-playback speaker-safe-and-bt-sco-wb">
         <path name="audio-with-haptics-playback bt-sco-wb"/>
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
     </path>
     <path name="audio-with-haptics-playback speaker-and-bt-sco-swb">
         <path name="audio-with-haptics-playback bt-sco-swb"/>
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
     </path>
     <path name="audio-with-haptics-playback bt-a2dp">
         <ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
@@ -2087,16 +2068,16 @@
     </path>
     <path name="audio-with-haptics-playback speaker-and-bt-a2dp">
         <path name="audio-with-haptics-playback bt-a2dp"/>
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
     </path>
     <path name="audio-with-haptics-playback speaker-safe-and-bt-a2dp">
         <path name="audio-with-haptics-playback bt-a2dp"/>
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
+        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
     </path>
     <path name="amic1">
-        <ctl name="TX DEC0 MUX" value="SWR_MIC"/>
-        <ctl name="TX SMIC MUX0" value="SWR_MIC0"/>
-        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1"/>
+        <ctl name="TX DEC1 MUX" value="SWR_MIC"/>
+        <ctl name="TX SMIC MUX1" value="SWR_MIC0"/>
+        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/>
         <ctl name="ADC1 ChMap" value="SWRM_TX1_CH1"/>
         <ctl name="ADC1_MIXER Switch" value="1"/>
     </path>
@@ -2123,32 +2104,73 @@
         <ctl name="HDR12 MUX" value="NO_HDR12"/>
     </path>
     <path name="amic4">
-        <ctl name="TX DEC2 MUX" value="SWR_MIC"/>
-        <ctl name="TX SMIC MUX2" value="SWR_MIC4"/>
-        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>
+        <ctl name="TX DEC1 MUX" value="SWR_MIC"/>
+        <ctl name="TX SMIC MUX1" value="SWR_MIC4"/>
+        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/>
         <ctl name="ADC3 ChMap" value="SWRM_TX2_CH1"/>
         <ctl name="ADC3_MIXER Switch" value="1"/>
         <ctl name="ADC3 MUX" value="INP4"/>
         <ctl name="HDR34 MUX" value="NO_HDR34"/>
     </path>
+    <path name="amic5">
+        <ctl name="TX DEC1 MUX" value="SWR_MIC"/>
+        <ctl name="TX SMIC MUX1" value="SWR_MIC5"/>
+        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/>
+        <ctl name="ADC4 ChMap" value="SWRM_TX2_CH2"/>
+        <ctl name="ADC4_MIXER Switch" value="1"/>
+        <ctl name="ADC4 MUX" value="INP5"/>
+    </path>
+    <path name="speaker">
+        <ctl name="PRIM_MI2S_RX Channels" value="Two"/>
+        <ctl name="WSA RX0 MUX" value="AIF1_PB"/>
+        <ctl name="WSA RX1 MUX" value="AIF1_PB"/>
+        <ctl name="WSA_RX0 INP0" value="RX0"/>
+        <ctl name="WSA_RX1 INP0" value="RX1"/>
+        <ctl name="WSA_COMP1 Switch" value="1"/>
+        <ctl name="WSA_COMP2 Switch" value="1"/>
+        <ctl name="SpkrLeft COMP Switch" value="1"/>
+        <ctl name="SpkrLeft VISENSE Switch" value="1"/>
+        <ctl name="SpkrLeft SWR DAC_Port Switch" value="1"/>
+        <ctl name="SpkrRight COMP Switch" value="1"/>
+        <ctl name="SpkrRight VISENSE Switch" value="1"/>
+        <ctl name="SpkrRight SWR DAC_Port Switch" value="1"/>
+        <ctl name="TASDEVICE Profile id" value="0"/>
+    </path>
     <path name="haptics">
         <ctl name="SWR DAC_Port Switch" value="1"/>
     </path>
     <path name="speaker-mono">
-        <ctl name="QUIN_MI2S_RX Channels" value="One"/>
-        <ctl name="aw_dev_0_prof" value="Music"/>
-        <ctl name="aw_dev_0_switch" value="Enable"/>
+        <ctl name="PRIM_MI2S_RX Channels" value="Two"/>
+        <ctl name="WSA RX0 MUX" value="AIF1_PB"/>
+        <ctl name="WSA_RX0 INP0" value="RX0"/>
+        <ctl name="WSA_COMP1 Switch" value="1"/>
+        <ctl name="SpkrLeft COMP Switch" value="1"/>
+        <ctl name="SpkrLeft VISENSE Switch" value="1"/>
+        <ctl name="SpkrLeft SWR DAC_Port Switch" value="1"/>
+        <ctl name="TASDEVICE Profile id" value="3"/>
     </path>
     <path name="speaker-mono-2">
-        <ctl name="QUIN_MI2S_RX Channels" value="One"/>
-        <ctl name="aw_dev_1_prof" value="Music"/>
-        <ctl name="aw_dev_1_switch" value="Enable"/>
+        <ctl name="PRIM_MI2S_RX Channels" value="Two"/>
+        <ctl name="WSA RX1 MUX" value="AIF1_PB"/>
+        <ctl name="WSA_RX1 INP0" value="RX1"/>
+        <ctl name="WSA_COMP2 Switch" value="1"/>
+        <ctl name="SpkrRight COMP Switch" value="1"/>
+        <ctl name="SpkrRight VISENSE Switch" value="1"/>
+        <ctl name="SpkrRight SWR DAC_Port Switch" value="1"/>
+        <ctl name="TASDEVICE Profile id" value="3"/>
     </path>
     <path name="speaker-vbat-mono">
         <path name="speaker-mono"/>
+        <ctl name="WSA_RX INT0 VBAT WSA RX0 VBAT Enable" value="1"/>
     </path>
     <path name="speaker-vbat-mono-2">
         <path name="speaker-mono-2"/>
+        <ctl name="WSA_RX INT1 VBAT WSA RX1 VBAT Enable" value="1"/>
+    </path>
+    <path name="speaker-vbat">
+        <path name="speaker"/>
+        <ctl name="WSA_RX INT0 VBAT WSA RX0 VBAT Enable" value="1"/>
+        <ctl name="WSA_RX INT1 VBAT WSA RX1 VBAT Enable" value="1"/>
     </path>
     <path name="speaker-hdk">
         <path name="speaker-mono"/>
@@ -2156,13 +2178,6 @@
     <path name="speaker-fluid">
         <path name="speaker-mono"/>
     </path>
-    <path name="speaker">
-        <ctl name="QUIN_MI2S_RX Channels" value="Two"/>
-        <ctl name="aw_dev_0_prof" value="Music"/>
-        <ctl name="aw_dev_0_switch" value="Enable"/>
-        <ctl name="aw_dev_1_prof" value="Music"/>
-        <ctl name="aw_dev_1_switch" value="Enable"/>
-    </path>
     <path name="speaker-liquid">
         <path name="speaker"/>
     </path>
@@ -2188,44 +2203,76 @@
         <ctl name="IIR0 INP0 Volume" value="54"/>
         <ctl name="IIR0 INP0 MUX" value="DEC2"/>
         <ctl name="RX INT2 MIX2 INP" value="SRC0"/>
+        <ctl name="WSA_RX0 INT0 SIDETONE MIX" value="SRC0"/>
     </path>
     <path name="afe-sidetone">
         <ctl name="Voice Sidetone Enable" value="1"/>
     </path>
+    <path name="dmic4">
+        <ctl name="TX_CDC_DMA_TX_3 Channels" value="One"/>
+        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/>
+        <ctl name="TX DMIC MUX1" value="DMIC0"/>
+    </path>
+    <path name="noise-mic">
+        <path name="dmic4"/>
+    </path>
     <path name="speaker-mic-sbc"/>
     <path name="speaker-protected">
-        <ctl name="QUIN_MI2S_RX Channels" value="Two"/>
-        <ctl name="aw_dev_0_prof" value="Music"/>
-        <ctl name="aw_dev_0_switch" value="Enable"/>
-        <ctl name="aw_dev_1_prof" value="Music"/>
-        <ctl name="aw_dev_1_switch" value="Enable"/>
+        <ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_1" value="1"/>
+        <ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_2" value="1"/>
+        <ctl name="WSA_CDC_DMA_0 TX Format" value="PACKED_16B"/>
+        <path name="speaker"/>
+        <ctl name="VI_FEED_TX Channels" value="Two"/>
+        <ctl name="WSA_RX_0_VI_FB_LCH_MUX" value="WSA_CDC_DMA_TX_0"/>
+        <ctl name="WSA_RX_0_VI_FB_RCH_MUX" value="WSA_CDC_DMA_TX_0"/>
+    </path>
+    <path name="voice-speaker-protected">
+        <ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_1" value="1"/>
+        <ctl name="WSA_CDC_DMA_0 TX Format" value="PACKED_16B"/>
+        <path name="speaker-mono"/>
+        <ctl name="VI_FEED_TX Channels" value="One"/>
+        <ctl name="WSA_RX_0_VI_FB_LCH_MUX" value="WSA_CDC_DMA_TX_0"/>
+    </path>
+    <path name="voice-speaker-2-protected">
+        <ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_2" value="1"/>
+        <ctl name="WSA_CDC_DMA_0 TX Format" value="PACKED_16B"/>
+        <path name="speaker-mono-2"/>
+        <ctl name="VI_FEED_TX Channels" value="One"/>
+        <ctl name="WSA_RX_0_VI_FB_RCH_MUX" value="WSA_CDC_DMA_TX_0"/>
     </path>
     <path name="voice-speaker-stereo-protected">
         <path name="speaker-protected"/>
     </path>
-    <path name="voice-speaker-2-protected">
-        <path name="speaker-mono-2"/>
+    <path name="speaker-protected-vbat">
+        <path name="speaker-protected"/>
+        <ctl name="WSA_RX INT0 VBAT WSA RX0 VBAT Enable" value="1"/>
+        <ctl name="WSA_RX INT1 VBAT WSA RX1 VBAT Enable" value="1"/>
+    </path>
+    <path name="voice-speaker-protected-vbat">
+        <path name="voice-speaker-protected"/>
+        <ctl name="WSA_RX INT0 VBAT WSA RX0 VBAT Enable" value="1"/>
     </path>
     <path name="voice-speaker-2-protected-vbat">
         <path name="voice-speaker-2-protected"/>
-    </path>
-    <path name="speaker-protected-vbat">
-        <ctl name="QUIN_MI2S_RX Channels" value="Two"/>
-        <ctl name="aw_dev_0_prof" value="Music"/>
-        <ctl name="aw_dev_0_switch" value="Enable"/>
-        <ctl name="aw_dev_1_prof" value="Music"/>
-        <ctl name="aw_dev_1_switch" value="Enable"/>
+        <ctl name="WSA_RX INT1 VBAT WSA RX1 VBAT Enable" value="1"/>
     </path>
     <path name="voice-speaker-stereo-protected-vbat">
-        <ctl name="QUIN_MI2S_RX Channels" value="Two"/>
-        <ctl name="aw_dev_0_prof" value="Music"/>
-        <ctl name="aw_dev_0_switch" value="Enable"/>
-        <ctl name="aw_dev_1_prof" value="Music"/>
-        <ctl name="aw_dev_1_switch" value="Enable"/>
+        <path name="speaker-protected-vbat"/>
     </path>
     <path name="vi-feedback"/>
     <path name="vi-feedback-mono-1"/>
     <path name="vi-feedback-mono-2"/>
+    <path name="handset">
+        <ctl name="PRIM_MI2S_RX Channels" value="Two"/>
+        <ctl name="WSA RX0 MUX" value="AIF1_PB"/>
+        <ctl name="WSA_RX0 INP0" value="RX0"/>
+        <ctl name="WSA_COMP1 Switch" value="1"/>
+        <ctl name="SpkrLeft COMP Switch" value="1"/>
+        <ctl name="SpkrLeft VISENSE Switch" value="1"/>
+        <ctl name="SpkrLeft SWR DAC_Port Switch" value="1"/>
+        <ctl name="EAR SPKR PA Gain" value="G_6_DB"/>
+        <ctl name="TASDEVICE Profile id" value="3"/>
+    </path>
     <path name="headphones">
         <ctl name="RX_MACRO RX0 MUX" value="AIF1_PB"/>
         <ctl name="RX_MACRO RX1 MUX" value="AIF1_PB"/>
@@ -2236,8 +2283,6 @@
         <ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT"/>
         <ctl name="RX_COMP1 Switch" value="1"/>
         <ctl name="RX_COMP2 Switch" value="1"/>
-        <ctl name="HPH_L Switch" value="1"/>
-        <ctl name="HPH_R Switch" value="1"/>
         <ctl name="HPHL_COMP Switch" value="1"/>
         <ctl name="HPHR_COMP Switch" value="1"/>
         <ctl name="HPHL_RDAC Switch" value="1"/>
@@ -2263,32 +2308,6 @@
     <path name="headset-mic-liquid">
         <path name="amic2"/>
     </path>
-    <path name="handset">
-        <ctl name="QUIN_MI2S_RX Channels" value="One"/>
-        <ctl name="aw_dev_0_prof" value="Receiver"/>
-        <ctl name="aw_dev_0_switch" value="Enable"/>
-    </path>
-    <path name="voice-hac">
-        <ctl name="RX_CDC_DMA_RX_1 Channels" value="One"/>
-        <ctl name="RX_MACRO RX2 MUX" value="AIF2_PB"/>
-        <ctl name="RX INT2_1 MIX1 INP0" value="RX2"/>
-        <ctl name="AUX_RDAC Switch" value="1"/>
-        <ctl name="HAC_PA Switch" value="1"/>
-    </path>
-    <path name="voice-hac-handset">
-        <ctl name="RX_CDC_DMA_RX_1 Channels" value="One"/>
-        <ctl name="RX_MACRO RX2 MUX" value="AIF2_PB"/>
-        <ctl name="RX INT2_1 MIX1 INP0" value="RX2"/>
-        <ctl name="AUX_RDAC Switch" value="1"/>
-        <ctl name="HAC_PA Switch" value="1"/>
-    </path>
-    <path name="hac-handset">
-        <ctl name="RX_CDC_DMA_RX_1 Channels" value="One"/>
-        <ctl name="RX_MACRO RX2 MUX" value="AIF2_PB"/>
-        <ctl name="RX INT2_1 MIX1 INP0" value="RX2"/>
-        <ctl name="AUX_RDAC Switch" value="1"/>
-        <ctl name="HAC_PA Switch" value="1"/>
-    </path>
     <path name="voice-handset">
         <path name="handset"/>
     </path>
@@ -2302,13 +2321,13 @@
         <path name="handset"/>
     </path>
     <path name="voice-speaker">
-        <path name="speaker-mono-2"/>
+        <path name="speaker-mono"/>
     </path>
     <path name="voice-speaker-stereo">
         <path name="speaker"/>
     </path>
     <path name="voice-speaker-2">
-        <path name="speaker"/>
+        <path name="speaker-mono-2"/>
     </path>
     <path name="voice-speaker-hdk">
         <path name="speaker-mono"/>
@@ -2322,19 +2341,14 @@
     <path name="voice-speaker-2-vbat">
         <path name="speaker-vbat-mono-2"/>
     </path>
-    <path name="speaker-vbat">
-        <path name="speaker"/>
-    </path>
     <path name="voice-speaker-stereo-vbat">
         <path name="speaker-vbat"/>
     </path>
     <path name="speaker-mic">
-        <ctl name="TX_CDC_DMA_TX_3 Channels" value="One"/>
-        <path name="amic4"/>
+        <path name="dmic4"/>
     </path>
     <path name="voice-speaker-mic">
-        <ctl name="TX_CDC_DMA_TX_3 Channels" value="One"/>
-        <path name="amic4"/>
+        <path name="speaker-mic"/>
     </path>
     <path name="voice-headphones">
         <path name="headphones"/>
@@ -2391,17 +2405,13 @@
         <path name="speaker"/>
         <path name="display-port1"/>
     </path>
+    <path name="dmic1">
+        <ctl name="TX_CDC_DMA_TX_3 Channels" value="One"/>
+        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>
+        <ctl name="TX DMIC MUX2" value="DMIC1"/>
+    </path>
     <path name="handset-mic">
-        <ctl name="TX_CDC_DMA_TX_3 Channels" value="One"/>
-        <path name="amic1"/>
-    </path>
-    <path name="handset-mic2">
-        <ctl name="TX_CDC_DMA_TX_3 Channels" value="One"/>
-        <path name="amic3"/>
-    </path>
-    <path name="handset-mic3">
-        <ctl name="TX_CDC_DMA_TX_3 Channels" value="One"/>
-        <path name="amic4"/>
+        <path name="dmic1"/>
     </path>
     <path name="voice-rec-mic">
         <path name="handset-mic"/>
@@ -2419,47 +2429,31 @@
     <path name="capture-fm"/>
     <path name="handset-dmic-endfire">
         <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two"/>
-        <path name="amic1"/>
-        <path name="amic3"/>
-    </path>
-    <path name="handset-dmic-endfire-aec">
-        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two"/>
-        <path name="amic1"/>
-        <path name="amic3"/>
+        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/>
+        <ctl name="TX DMIC MUX1" value="DMIC1"/>
+        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>
+        <ctl name="TX DMIC MUX2" value="DMIC0"/>
     </path>
     <path name="dmic-endfire">
         <path name="handset-dmic-endfire"/>
-        <ctl name="IIR0 INP0 MUX" value="DEC2"/>
+        <ctl name="IIR0 INP0 MUX" value="DEC1"/>
     </path>
     <path name="dmic-endfire-liquid">
         <path name="handset-dmic-endfire"/>
         <ctl name="IIR0 INP0 MUX" value="DEC7"/>
     </path>
     <path name="handset-stereo-dmic-ef">
-        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two"/>
-        <path name="amic1"/>
-        <path name="amic3"/>
-    </path>
-    <path name="speaker-dmic">
-        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two"/>
-        <ctl name="TX DEC0 MUX" value="SWR_MIC"/>
-        <ctl name="TX SMIC MUX2" value="SWR_MIC0"/>
-        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1"/>
-        <ctl name="ADC1 ChMap" value="SWRM_TX1_CH1"/>
-        <ctl name="ADC1_MIXER Switch" value="1"/>
-        <ctl name="TX DEC2 MUX" value="SWR_MIC"/>
-        <ctl name="TX SMIC MUX0" value="SWR_MIC4"/>
-        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>
-        <ctl name="ADC3 ChMap" value="SWRM_TX2_CH1"/>
-        <ctl name="ADC3_MIXER Switch" value="1"/>
-        <ctl name="ADC3 MUX" value="INP4"/>
-        <ctl name="HDR34 MUX" value="NO_HDR34"/>
+        <path name="handset-dmic-endfire"/>
     </path>
     <path name="speaker-dmic-endfire">
-        <path name="speaker-dmic"/>
+        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two"/>
+        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/>
+        <ctl name="TX DMIC MUX1" value="DMIC1"/>
+        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>
+        <ctl name="TX DMIC MUX2" value="DMIC0"/>
     </path>
     <path name="speaker-stereo-dmic-ef">
-        <path name="speaker-dmic"/>
+        <path name="speaker-dmic-endfire"/>
     </path>
     <path name="voice-dmic-ef-tmus">
         <path name="dmic-endfire"/>
@@ -2498,7 +2492,11 @@
         <path name="dmic-endfire-liquid"/>
     </path>
     <path name="speaker-dmic-broadside">
-        <path name="speaker-dmic-endfire"/>
+        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two"/>
+        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/>
+        <ctl name="TX DMIC MUX1" value="DMIC3"/>
+        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>
+        <ctl name="TX DMIC MUX2" value="DMIC0"/>
     </path>
     <path name="dmic-broadside">
         <path name="speaker-dmic-broadside"/>
@@ -2507,58 +2505,33 @@
     <path name="voice-speaker-dmic-broadside">
         <path name="dmic-broadside"/>
     </path>
-    <path name="speaker-tmic">
+    <path name="three-mic">
         <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three"/>
-        <ctl name="TX DEC0 MUX" value="SWR_MIC"/>
-        <ctl name="TX SMIC MUX2" value="SWR_MIC0"/>
-        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1"/>
-        <ctl name="ADC1 ChMap" value="SWRM_TX1_CH1"/>
-        <ctl name="ADC1_MIXER Switch" value="1"/>
-        <ctl name="TX DEC2 MUX" value="SWR_MIC"/>
-        <ctl name="TX SMIC MUX0" value="SWR_MIC4"/>
-        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>
-        <ctl name="ADC3 ChMap" value="SWRM_TX2_CH1"/>
-        <ctl name="ADC3_MIXER Switch" value="1"/>
-        <ctl name="ADC3 MUX" value="INP4"/>
-        <ctl name="HDR34 MUX" value="NO_HDR34"/>
-        <ctl name="TX DEC3 MUX" value="SWR_MIC"/>
-        <ctl name="TX SMIC MUX3" value="SWR_MIC5"/>
-        <ctl name="TX_AIF1_CAP Mixer DEC3" value="1"/>
-        <ctl name="ADC4 ChMap" value="SWRM_TX2_CH2"/>
-        <ctl name="ADC4_MIXER Switch" value="1"/>
-        <ctl name="ADC4 MUX" value="INP5"/>
-    </path>
-    <path name="speaker-tmic-back">
-        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three"/>
-        <ctl name="TX DEC0 MUX" value="SWR_MIC"/>
-        <ctl name="TX SMIC MUX1" value="SWR_MIC0"/>
-        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1"/>
-        <ctl name="ADC1 ChMap" value="SWRM_TX1_CH1"/>
-        <ctl name="ADC1_MIXER Switch" value="1"/>
-        <ctl name="TX DEC1 MUX" value="SWR_MIC"/>
-        <ctl name="TX SMIC MUX0" value="SWR_MIC1"/>
         <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/>
-        <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2"/>
-        <ctl name="ADC2_MIXER Switch" value="1"/>
-        <ctl name="ADC2 MUX" value="INP3"/>
-        <ctl name="HDR12 MUX" value="NO_HDR12"/>
-        <ctl name="TX DEC3 MUX" value="SWR_MIC"/>
-        <ctl name="TX SMIC MUX3" value="SWR_MIC5"/>
+        <ctl name="TX DMIC MUX1" value="DMIC3"/>
+        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>
+        <ctl name="TX DMIC MUX2" value="DMIC0"/>
         <ctl name="TX_AIF1_CAP Mixer DEC3" value="1"/>
-        <ctl name="ADC4 ChMap" value="SWRM_TX2_CH2"/>
-        <ctl name="ADC4_MIXER Switch" value="1"/>
-        <ctl name="ADC4 MUX" value="INP5"/>
+        <ctl name="TX DMIC MUX3" value="DMIC2"/>
+    </path>
+    <path name="speaker-tmic">
+        <path name="three-mic"/>
     </path>
     <path name="voice-speaker-tmic">
         <path name="speaker-tmic"/>
     </path>
-    <path name="speaker-qmic">
-        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three"/>
-        <path name="amic1"/>
-        <path name="amic3"/>
-        <path name="amic4"/>
-    </path>
     <path name="speaker-qmic-liquid"/>
+    <path name="speaker-qmic">
+        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Four"/>
+        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/>
+        <ctl name="TX DMIC MUX1" value="DMIC3"/>
+        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>
+        <ctl name="TX DMIC MUX2" value="DMIC0"/>
+        <ctl name="TX_AIF1_CAP Mixer DEC3" value="1"/>
+        <ctl name="TX DMIC MUX3" value="DMIC2"/>
+        <ctl name="TX_AIF1_CAP Mixer DEC4" value="1"/>
+        <ctl name="TX DMIC MUX4" value="DMIC1"/>
+    </path>
     <path name="voice-speaker-qmic">
         <path name="speaker-qmic"/>
     </path>
@@ -2608,6 +2581,16 @@
         <ctl name="ADC2 Volume" value="0"/>
         <ctl name="TX_DEC5 Volume" value="84"/>
     </path>
+    <path name="voice-tty-hco-headset-mic">
+        <ctl name="TX DEC6 MUX" value="SWR_MIC"/>
+        <ctl name="TX SMIC MUX6" value="SWR_MIC1"/>
+        <ctl name="TX_CDC_DMA_TX_3 Channels" value="One"/>
+        <ctl name="TX_AIF1_CAP Mixer DEC6" value="1"/>
+        <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2"/>
+        <ctl name="ADC2_MIXER Switch" value="1"/>
+        <ctl name="ADC2 MUX" value="INP2"/>
+        <ctl name="HDR12 MUX" value="NO_HDR12"/>
+    </path>
     <path name="unprocessed-handset-mic">
         <path name="handset-mic"/>
     </path>
@@ -2617,18 +2600,6 @@
     <path name="unprocessed-stereo-mic">
         <path name="voice-rec-dmic-ef"/>
     </path>
-    <path name="three-mic">
-        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three"/>
-        <path name="amic1"/>
-        <path name="amic3"/>
-        <path name="amic4"/>
-    </path>
-    <path name="three-mic-aec-ns">
-        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three"/>
-        <path name="amic1"/>
-        <path name="amic3"/>
-        <path name="amic4"/>
-    </path>
     <path name="unprocessed-three-mic">
         <path name="three-mic"/>
     </path>
@@ -2653,7 +2624,7 @@
         <path name="voice-tty-full-usb-mic"/>
     </path>
     <path name="ADSP testfwk">
-        <ctl name="QUIN_MI2S_RX_DL_HL Switch" value="1"/>
+        <ctl name="PRIM_MI2S_RX_DL_HL Switch" value="1"/>
     </path>
     <path name="bt-a2dp">
         <ctl name="SLIM7_RX ADM Channels" value="Two"/>
@@ -2771,7 +2742,7 @@
         <path name="audio-ull-playback"/>
     </path>
     <path name="mmap-playback">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia16" value="1"/>
+        <ctl name="PRIM_MI2S_RX Audio Mixer MultiMedia16" value="1"/>
     </path>
     <path name="mmap-playback headphones">
         <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="1"/>
@@ -2887,11 +2858,6 @@
     </path>
     <path name="incall_music_uplink handset-hac">
         <path name="incall_music_uplink"/>
-        <ctl name="HAC_PA Switch" value="1"/>
-    </path>
-    <path name="incall_music_uplink voice-hac-handset">
-        <path name="incall_music_uplink"/>
-        <ctl name="HAC_PA Switch" value="1"/>
     </path>
     <path name="incall_music_uplink display-port">
         <path name="incall_music_uplink"/>
@@ -2976,11 +2942,6 @@
     </path>
     <path name="incall_music_uplink2 handset-hac">
         <path name="incall_music_uplink2"/>
-        <ctl name="HAC_PA Switch" value="1"/>
-    </path>
-    <path name="incall_music_uplink2 voice-hac-handset">
-        <path name="incall_music_uplink2"/>
-        <ctl name="HAC_PA Switch" value="1"/>
     </path>
     <path name="incall_music_uplink2 display-port">
         <path name="incall_music_uplink2"/>
@@ -3032,11 +2993,6 @@
     </path>
     <path name="call-proxy"/>
     <path name="call-proxy-in"/>
-    <path name="dmic1">
-        <ctl name="TX_CDC_DMA_TX_3 Channels" value="One"/>
-        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>
-        <ctl name="TX DMIC MUX2" value="DMIC0"/>
-    </path>
     <path name="dmic2">
         <ctl name="TX_CDC_DMA_TX_3 Channels" value="One"/>
         <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>
@@ -3047,11 +3003,6 @@
         <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>
         <ctl name="TX DMIC MUX2" value="DMIC2"/>
     </path>
-    <path name="dmic4">
-        <ctl name="TX_CDC_DMA_TX_3 Channels" value="One"/>
-        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>
-        <ctl name="TX DMIC MUX2" value="DMIC3"/>
-    </path>
     <path name="headphones-dsd">
         <ctl name="RX_CDC_DMA_5 RX Format" value="DSD_DOP"/>
         <ctl name="RX_CDC_DMA_RX_5 Channels" value="One"/>
@@ -3063,101 +3014,55 @@
         <ctl name="HPHR_RDAC Switch" value="1"/>
     </path>
     <path name="deep-buffer-playback handset">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia1" value="1"/>
-    </path>
-    <path name="deep-buffer-playback hac-handset">
-        <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia1" value="1"/>
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="1"/>
     </path>
     <path name="low-latency-playback handset">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia5" value="1"/>
-    </path>
-    <path name="low-latency-playback hac-handset">
-        <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia5" value="1"/>
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia5" value="1"/>
     </path>
     <path name="audio-ull-playback handset">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia8" value="1"/>
-    </path>
-    <path name="audio-ull-playback hac-handset">
-        <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia8" value="1"/>
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia8" value="1"/>
     </path>
     <path name="compress-offload-playback handset">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia4" value="1"/>
-    </path>
-    <path name="compress-offload-playback hac-handset">
-        <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia4" value="1"/>
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia4" value="1"/>
     </path>
     <path name="compress-offload-playback2 handset">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia7" value="1"/>
-    </path>
-    <path name="compress-offload-playback2 hac-handset">
-        <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia7" value="1"/>
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia7" value="1"/>
     </path>
     <path name="compress-offload-playback3 handset">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia10" value="1"/>
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="1"/>
     </path>
     <path name="compress-offload-playback4 handset">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia11" value="1"/>
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia11" value="1"/>
     </path>
     <path name="compress-offload-playback5 handset">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia12" value="1"/>
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia12" value="1"/>
     </path>
     <path name="compress-offload-playback6 handset">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia13" value="1"/>
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia13" value="1"/>
     </path>
     <path name="compress-offload-playback7 handset">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia14" value="1"/>
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia14" value="1"/>
     </path>
     <path name="compress-offload-playback8 handset">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia15" value="1"/>
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia15" value="1"/>
     </path>
     <path name="compress-offload-playback9 handset">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia16" value="1"/>
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="1"/>
     </path>
     <path name="compress-voip-call handset">
-        <ctl name="QUIN_MI2S_RX_Voice Mixer Voip" value="1"/>
-        <ctl name="Voip_Tx Mixer TX_CDC_DMA_TX_3_Voip" value="1"/>
-    </path>
-    <path name="compress-voip-call hac-handset">
-        <ctl name="RX_CDC_DMA_RX_1_Voice Mixer Voip" value="1"/>
+        <ctl name="RX_CDC_DMA_RX_0_Voice Mixer Voip" value="1"/>
         <ctl name="Voip_Tx Mixer TX_CDC_DMA_TX_3_Voip" value="1"/>
     </path>
     <path name="voicemmode1-call handset">
-        <ctl name="QUIN_MI2S_RX_Voice Mixer VoiceMMode1" value="1"/>
-        <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1"/>
-    </path>
-    <path name="voicemmode1-call voice-hac">
-        <ctl name="RX_CDC_DMA_RX_1_Voice Mixer VoiceMMode1" value="1"/>
-        <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1"/>
-    </path>
-    <path name="voicemmode1-call voice-hac-handset">
-        <ctl name="RX_CDC_DMA_RX_1_Voice Mixer VoiceMMode1" value="1"/>
-        <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1"/>
-    </path>
-    <path name="voicemmode1-call hac-handset">
-        <ctl name="RX_CDC_DMA_RX_1_Voice Mixer VoiceMMode1" value="1"/>
+        <ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode1" value="1"/>
         <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1"/>
     </path>
     <path name="voicemmode2-call handset">
-        <ctl name="QUIN_MI2S_RX_Voice Mixer VoiceMMode2" value="1"/>
-        <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1"/>
-    </path>
-    <path name="voicemmode2-call voice-hac">
-        <ctl name="RX_CDC_DMA_RX_1_Voice Mixer VoiceMMode2" value="1"/>
-        <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1"/>
-    </path>
-    <path name="voicemmode2-call voice-hac-handset">
-        <ctl name="RX_CDC_DMA_RX_1_Voice Mixer VoiceMMode2" value="1"/>
-        <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1"/>
-    </path>
-    <path name="voicemmode2-call hac-handset">
-        <ctl name="RX_CDC_DMA_RX_1_Voice Mixer VoiceMMode2" value="1"/>
+        <ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode2" value="1"/>
         <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1"/>
     </path>
     <path name="audio-playback-voip handset">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia10" value="1"/>
-    </path>
-    <path name="audio-playback-voip hac-handset">
-        <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia10" value="1"/>
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="1"/>
     </path>
     <path name="dmic5">
         <ctl name="TX_CDC_DMA_TX_3 Channels" value="One"/>
@@ -3170,10 +3075,7 @@
         <ctl name="TX DMIC MUX2" value="DMIC5"/>
     </path>
     <path name="mmap-playback handset">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia16" value="1"/>
-    </path>
-    <path name="mmap-playback hac-handset">
-        <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia16" value="1"/>
+        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="1"/>
     </path>
     <path name="deep-buffer-playback speaker-safe-and-display-port">
         <path name="deep-buffer-playback display-port"/>
@@ -3566,66 +3468,39 @@
     <path name="hph-class-ab-mode">
         <ctl name="RX HPH Mode" value="CLS_AB"/>
     </path>
-    <path name="echo-reference">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="QUIN_MI2S_RX"/>
-        <ctl name="AUDIO_REF_EC_UL10 MUX" value="QUIN_MI2S_RX"/>
-        <ctl name="EC Reference Channels" value="One"/>
+    <path name="audio-record hdmi-in">
+        <ctl name="MultiMedia1 Mixer PRI_MI2S_TX" value="1"/>
     </path>
-    <path name="echo-reference handset">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="QUIN_MI2S_RX"/>
-        <ctl name="EC Reference Channels" value="One"/>
-    </path>
-    <path name="echo-reference hac-handset">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_1"/>
-        <ctl name="EC Reference Channels" value="One"/>
-    </path>
-    <path name="echo-reference-voip-low-latency">
-        <ctl name="AUDIO_REF_EC_UL8 MUX" value="QUIN_MI2S_RX"/>
-        <ctl name="EC Reference Channels" value="One"/>
-    </path>
-    <path name="echo-reference-voip-low-latency handset">
-        <ctl name="AUDIO_REF_EC_UL8 MUX" value="QUIN_MI2S_RX"/>
-        <ctl name="EC Reference Channels" value="One"/>
-    </path>
-    <path name="echo-reference-voip-low-latency hac-handset">
-        <ctl name="AUDIO_REF_EC_UL8 MUX" value="RX_CDC_DMA_RX_1"/>
-        <ctl name="EC Reference Channels" value="One"/>
-    </path>
-    <path name="echo-reference-voip">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="QUIN_MI2S_RX"/>
-        <ctl name="AUDIO_REF_EC_UL10 MUX" value="QUIN_MI2S_RX"/>
-        <ctl name="EC Reference Channels" value="One"/>
-    </path>
-    <path name="echo-reference-voip handset">
-        <ctl name="AUDIO_REF_EC_UL10 MUX" value="QUIN_MI2S_RX"/>
-        <ctl name="EC Reference Channels" value="One"/>
-    </path>
-    <path name="echo-reference-voip hac-handset">
-        <ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_1"/>
-        <ctl name="EC Reference Channels" value="One"/>
+    <path name="hdmi-in"/>
+    <path name="audio-record-compress2 hdmi-in">
+        <ctl name="MultiMedia17 Mixer PRI_MI2S_TX" value="1"/>
     </path>
     <path name="speaker-mic-liquid">
-        <path name="amic4"/>
+        <path name="dmic4"/>
     </path>
-    <path name="voice-speaker-protected">
-        <path name="speaker-mono"/>
+    <path name="dmic-nn">
+        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two"/>
+        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/>
+        <ctl name="TX DMIC MUX1" value="DMIC2"/>
+        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>
+        <ctl name="TX DMIC MUX2" value="DMIC3"/>
+        <ctl name="TX_DEC1 Volume" value="104"/>
+        <ctl name="TX_DEC2 Volume" value="104"/>
     </path>
-    <path name="voice-speaker-protected-vbat">
-        <path name="voice-speaker-protected"/>
-    </path>
-    <path name="voice-tty-hco-headset-mic">
-        <ctl name="TX DEC6 MUX" value="SWR_MIC"/>
-        <ctl name="TX SMIC MUX6" value="SWR_MIC1"/>
-        <ctl name="TX_CDC_DMA_TX_3 Channels" value="One"/>
-        <ctl name="TX_AIF1_CAP Mixer DEC6" value="1"/>
-        <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2"/>
-        <ctl name="ADC2_MIXER Switch" value="1"/>
-        <ctl name="ADC2 MUX" value="INP2"/>
-        <ctl name="HDR12 MUX" value="NO_HDR12"/>
+    <path name="three-mic-nn">
+        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three"/>
+        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/>
+        <ctl name="TX DMIC MUX1" value="DMIC2"/>
+        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>
+        <ctl name="TX DMIC MUX2" value="DMIC3"/>
+        <ctl name="TX_AIF1_CAP Mixer DEC3" value="1"/>
+        <ctl name="TX DMIC MUX3" value="DMIC5"/>
+        <ctl name="TX_DEC1 Volume" value="104"/>
+        <ctl name="TX_DEC2 Volume" value="104"/>
+        <ctl name="TX_DEC3 Volume" value="104"/>
     </path>
     <path name="voice-tty-vco-handset-mic">
-        <ctl name="TX_CDC_DMA_TX_3 Channels" value="One"/>
-        <path name="amic1"/>
+        <path name="dmic1"/>
     </path>
     <path name="audio-record capture-fm">
         <ctl name="MultiMedia1 Mixer SEC_MI2S_TX" value="1"/>
@@ -3638,14 +3513,22 @@
     </path>
     <path name="play-fm">
         <ctl name="SEC MI2S LOOPBACK Volume" value="1"/>
-        <ctl name="QUIN_MI2S_RX Port Mixer SEC_MI2S_TX" value="1"/>
-        <ctl name="QUIN_MI2S_RX_DL_HL Switch" value="1"/>
+        <ctl name="WSA_CDC_DMA_RX_0 Port Mixer SEC_MI2S_TX" value="1"/>
+        <ctl name="WSA_CDC_DMA_RX_0_DL_HL Switch" value="1"/>
     </path>
     <path name="mmap-record capture-fm">
         <ctl name="MultiMedia16 Mixer SEC_MI2S_TX" value="1"/>
     </path>
-    <path name="audio-with-haptics-playback handset">
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia32" value="1"/>
-        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia31" value="1"/>
+    <path name="echo-reference usb-headphones">
+        <ctl name="AUDIO_REF_EC_UL1 MUX" value="USB_AUDIO_RX"/>
+        <ctl name="EC Reference Channels" value="Two"/>
     </path>
-</mixer>
\ No newline at end of file
+    <path name="echo-reference-voip-low-latency usb-headphones">
+        <ctl name="AUDIO_REF_EC_UL8 MUX" value="USB_AUDIO_RX"/>
+        <ctl name="EC Reference Channels" value="Two"/>
+    </path>
+    <path name="echo-reference-voip usb-headphones">
+        <ctl name="AUDIO_REF_EC_UL10 MUX" value="USB_AUDIO_RX"/>
+        <ctl name="EC Reference Channels" value="Two"/>
+    </path>
+</mixer>
diff --git a/audio/sound_trigger_mixer_paths_yupikidp.xml b/audio/sound_trigger_mixer_paths_yupikidp.xml
index 67aaf00..0c1dc89 100644
--- a/audio/sound_trigger_mixer_paths_yupikidp.xml
+++ b/audio/sound_trigger_mixer_paths_yupikidp.xml
@@ -244,13 +244,13 @@
         <ctl name="ADC2_BCS Disable" value="1"/>
     </path>
     <path name="echo-reference">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="QUIN_MI2S_RX"/>
+        <ctl name="AUDIO_REF_EC_UL1 MUX" value="WSA_CDC_DMA_RX_0"/>
         <ctl name="EC Reference Channels" value="Two"/>
         <ctl name="EC Reference Bit Format" value="S16_LE"/>
         <ctl name="EC Reference SampleRate" value="48000"/>
     </path>
     <path name="echo-reference handset">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_0"/>
+        <ctl name="AUDIO_REF_EC_UL1 MUX" value="WSA_CDC_DMA_RX_0"/>
         <ctl name="EC Reference Channels" value="One"/>
         <ctl name="EC Reference Bit Format" value="S16_LE"/>
         <ctl name="EC Reference SampleRate" value="48000"/>