diff --git a/configs/msm8909/mixer_paths.xml b/configs/msm8909/mixer_paths.xml
index 0f5b333..61705c1 100644
--- a/configs/msm8909/mixer_paths.xml
+++ b/configs/msm8909/mixer_paths.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.         -->
+<!-- Copyright (c) 2014-2017, 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 -->
@@ -98,7 +98,7 @@
     <ctl name="Voice_Tx Mixer TERT_MI2S_TX_Voice" value="0" />
     <ctl name="PRI_MI2S_RX Port Mixer INT_BT_SCO_TX" value="0" />
     <!-- Voice BTSCO -->
-    <ctl name="Internal BTSCO SampleRate" value="8000" />
+    <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_8KHZ" />
     <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer CSVoice" value="0" />
     <ctl name="Voice_Tx Mixer INTERNAL_BT_SCO_TX_Voice" value="0" />
     <ctl name="INTERNAL_BT_SCO_RX Audio Mixer Multimedia6" value="0" />
@@ -126,7 +126,6 @@
     <!-- Voip -->
     <ctl name="PRI_MI2S_RX_Voice Mixer Voip" value="0" />
     <ctl name="Voip_Tx Mixer TERT_MI2S_TX_Voip" value="0" />
-    <ctl name="Internal BTSCO SampleRate" value="8000" />
     <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="0" />
     <ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="0" />
     <!-- Voip end -->
@@ -199,7 +198,7 @@
     <!-- ADSP testfwk end-->
 
     <path name="bt-sco-wb-samplerate">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
     </path>
 
     <!-- These are audio route (FE to BE) specific mixer settings -->
@@ -212,7 +211,7 @@
     </path>
 
     <path name="deep-buffer-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="deep-buffer-playback bt-sco" />
     </path>
 
@@ -242,7 +241,7 @@
     </path>
 
     <path name="low-latency-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="low-latency-playback bt-sco" />
     </path>
 
@@ -272,7 +271,7 @@
     </path>
 
     <path name="compress-offload-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="compress-offload-playback bt-sco" />
     </path>
 
@@ -310,7 +309,7 @@
     </path>
 
     <path name="audio-record bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="audio-record bt-sco" />
     </path>
 
@@ -341,7 +340,7 @@
     </path>
 
     <path name="voice-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voice-call bt-sco" />
     </path>
 
@@ -361,7 +360,7 @@
     </path>
 
     <path name="voice2-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voice2-call bt-sco" />
     </path>
 
@@ -392,7 +391,7 @@
     </path>
 
     <path name="vowlan-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="vowlan-call bt-sco" />
     </path>
 
@@ -412,7 +411,7 @@
     </path>
 
     <path name="voicemmode1-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voicemmode1-call bt-sco" />
     </path>
 
@@ -436,7 +435,7 @@
     </path>
 
     <path name="voicemmode2-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voicemmode2-call bt-sco" />
     </path>
 
@@ -457,7 +456,7 @@
     </path>
 
     <path name="hfp-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="hfp-sco" />
     </path>
 
@@ -522,7 +521,7 @@
     </path>
 
    <path name="volte-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="volte-call bt-sco" />
     </path>
 
@@ -542,7 +541,7 @@
     </path>
 
     <path name="compress-voip-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="compress-voip-call bt-sco" />
     </path>
 
@@ -578,7 +577,7 @@
     </path>
 
     <path name="qchat-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="qchat-call bt-sco" />
     </path>
 
diff --git a/configs/msm8909/mixer_paths_msm8909_pm8916.xml b/configs/msm8909/mixer_paths_msm8909_pm8916.xml
index 559a5bf..4c66233 100644
--- a/configs/msm8909/mixer_paths_msm8909_pm8916.xml
+++ b/configs/msm8909/mixer_paths_msm8909_pm8916.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.         -->
+<!-- Copyright (c) 2014-2017, 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 -->
@@ -101,7 +101,7 @@
     <ctl name="Voice_Tx Mixer TERT_MI2S_TX_Voice" value="0" />
     <ctl name="PRI_MI2S_RX Port Mixer INT_BT_SCO_TX" value="0" />
     <!-- Voice BTSCO -->
-    <ctl name="Internal BTSCO SampleRate" value="8000" />
+    <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_8KHZ" />
     <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer CSVoice" value="0" />
     <ctl name="Voice_Tx Mixer INTERNAL_BT_SCO_TX_Voice" value="0" />
     <ctl name="INTERNAL_BT_SCO_RX Audio Mixer Multimedia6" value="0" />
@@ -129,7 +129,6 @@
     <!-- Voip -->
     <ctl name="PRI_MI2S_RX_Voice Mixer Voip" value="0" />
     <ctl name="Voip_Tx Mixer TERT_MI2S_TX_Voip" value="0" />
-    <ctl name="Internal BTSCO SampleRate" value="8000" />
     <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="0" />
     <ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="0" />
     <!-- Voip end -->
@@ -202,7 +201,7 @@
     <!-- ADSP testfwk end-->
 
     <path name="bt-sco-wb-samplerate">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
     </path>
 
     <!-- These are audio route (FE to BE) specific mixer settings -->
@@ -215,7 +214,7 @@
     </path>
 
     <path name="deep-buffer-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="deep-buffer-playback bt-sco" />
     </path>
 
@@ -245,7 +244,7 @@
     </path>
 
     <path name="low-latency-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="low-latency-playback bt-sco" />
     </path>
 
@@ -275,7 +274,7 @@
     </path>
 
     <path name="compress-offload-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="compress-offload-playback bt-sco" />
     </path>
 
@@ -313,7 +312,7 @@
     </path>
 
     <path name="audio-record bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="audio-record bt-sco" />
     </path>
 
@@ -344,7 +343,7 @@
     </path>
 
     <path name="voice-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voice-call bt-sco" />
     </path>
 
@@ -364,7 +363,7 @@
     </path>
 
     <path name="voice2-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voice2-call bt-sco" />
     </path>
 
@@ -395,7 +394,7 @@
     </path>
 
     <path name="vowlan-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="vowlan-call bt-sco" />
     </path>
 
@@ -415,7 +414,7 @@
     </path>
 
     <path name="voicemmode1-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voicemmode1-call bt-sco" />
     </path>
 
@@ -439,7 +438,7 @@
     </path>
 
     <path name="voicemmode2-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voicemmode2-call bt-sco" />
     </path>
 
@@ -460,7 +459,7 @@
     </path>
 
     <path name="hfp-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="hfp-sco" />
     </path>
 
@@ -525,7 +524,7 @@
     </path>
 
    <path name="volte-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="volte-call bt-sco" />
     </path>
 
@@ -545,7 +544,7 @@
     </path>
 
     <path name="compress-voip-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="compress-voip-call bt-sco" />
     </path>
 
@@ -581,7 +580,7 @@
     </path>
 
     <path name="qchat-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="qchat-call bt-sco" />
     </path>
 
diff --git a/configs/msm8909/mixer_paths_qrd_skuh.xml b/configs/msm8909/mixer_paths_qrd_skuh.xml
index d3b232c..16791a9 100644
--- a/configs/msm8909/mixer_paths_qrd_skuh.xml
+++ b/configs/msm8909/mixer_paths_qrd_skuh.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-    Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
+    Copyright (c) 2014-2017, 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
@@ -101,7 +101,7 @@
     <ctl name="Voice_Tx Mixer TERT_MI2S_TX_Voice" value="0" />
     <ctl name="PRI_MI2S_RX Port Mixer INT_BT_SCO_TX" value="0" />
     <!-- Voice BTSCO -->
-    <ctl name="Internal BTSCO SampleRate" value="8000" />
+    <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_8KHZ" />
     <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer CSVoice" value="0" />
     <ctl name="Voice_Tx Mixer INTERNAL_BT_SCO_TX_Voice" value="0" />
     <ctl name="INTERNAL_BT_SCO_RX Audio Mixer Multimedia6" value="0" />
@@ -129,7 +129,6 @@
     <!-- Voip -->
     <ctl name="PRI_MI2S_RX_Voice Mixer Voip" value="0" />
     <ctl name="Voip_Tx Mixer TERT_MI2S_TX_Voip" value="0" />
-    <ctl name="Internal BTSCO SampleRate" value="8000" />
     <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="0" />
     <ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="0" />
     <!-- Voip end -->
@@ -199,7 +198,7 @@
     <!-- ADSP testfwk end-->
 
     <path name="bt-sco-wb-samplerate">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
     </path>
 
     <!-- These are audio route (FE to BE) specific mixer settings -->
@@ -212,6 +211,7 @@
     </path>
 
     <path name="deep-buffer-playback bt-sco-wb">
+        <path name="bt-sco-wb-samplerate" />
         <path name="deep-buffer-playback bt-sco" />
     </path>
 
@@ -241,6 +241,7 @@
     </path>
 
     <path name="low-latency-playback bt-sco-wb">
+        <path name="bt-sco-wb-samplerate" />
         <path name="low-latency-playback bt-sco" />
     </path>
 
@@ -270,7 +271,7 @@
     </path>
 
     <path name="compress-offload-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="compress-offload-playback bt-sco" />
     </path>
 
@@ -308,7 +309,7 @@
     </path>
 
     <path name="audio-record bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="audio-record bt-sco" />
     </path>
 
@@ -335,7 +336,7 @@
     </path>
 
     <path name="voice-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voice-call bt-sco" />
     </path>
 
@@ -355,7 +356,7 @@
     </path>
 
     <path name="voice2-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voice2-call bt-sco" />
     </path>
 
@@ -386,7 +387,7 @@
     </path>
 
     <path name="vowlan-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="vowlan-call bt-sco" />
     </path>
 
@@ -406,7 +407,7 @@
     </path>
 
     <path name="voicemmode1-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voicemmode1-call bt-sco" />
     </path>
 
@@ -430,7 +431,7 @@
     </path>
 
     <path name="voicemmode2-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voicemmode2-call bt-sco" />
     </path>
 
@@ -451,7 +452,7 @@
     </path>
 
     <path name="hfp-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="hfp-sco" />
     </path>
 
@@ -516,7 +517,7 @@
     </path>
 
    <path name="volte-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="volte-call bt-sco" />
     </path>
 
@@ -536,7 +537,7 @@
     </path>
 
     <path name="compress-voip-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="compress-voip-call bt-sco" />
     </path>
 
@@ -572,7 +573,7 @@
     </path>
 
     <path name="qchat-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="qchat-call bt-sco" />
     </path>
 
diff --git a/configs/msm8909/mixer_paths_qrd_skui.xml b/configs/msm8909/mixer_paths_qrd_skui.xml
index d3b232c..66f06a5 100644
--- a/configs/msm8909/mixer_paths_qrd_skui.xml
+++ b/configs/msm8909/mixer_paths_qrd_skui.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-    Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
+    Copyright (c) 2014-2017, 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
@@ -101,7 +101,7 @@
     <ctl name="Voice_Tx Mixer TERT_MI2S_TX_Voice" value="0" />
     <ctl name="PRI_MI2S_RX Port Mixer INT_BT_SCO_TX" value="0" />
     <!-- Voice BTSCO -->
-    <ctl name="Internal BTSCO SampleRate" value="8000" />
+    <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_8KHZ" />
     <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer CSVoice" value="0" />
     <ctl name="Voice_Tx Mixer INTERNAL_BT_SCO_TX_Voice" value="0" />
     <ctl name="INTERNAL_BT_SCO_RX Audio Mixer Multimedia6" value="0" />
@@ -129,7 +129,6 @@
     <!-- Voip -->
     <ctl name="PRI_MI2S_RX_Voice Mixer Voip" value="0" />
     <ctl name="Voip_Tx Mixer TERT_MI2S_TX_Voip" value="0" />
-    <ctl name="Internal BTSCO SampleRate" value="8000" />
     <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="0" />
     <ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="0" />
     <!-- Voip end -->
@@ -199,7 +198,7 @@
     <!-- ADSP testfwk end-->
 
     <path name="bt-sco-wb-samplerate">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
     </path>
 
     <!-- These are audio route (FE to BE) specific mixer settings -->
@@ -270,7 +269,7 @@
     </path>
 
     <path name="compress-offload-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="compress-offload-playback bt-sco" />
     </path>
 
@@ -308,7 +307,7 @@
     </path>
 
     <path name="audio-record bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="audio-record bt-sco" />
     </path>
 
@@ -335,7 +334,7 @@
     </path>
 
     <path name="voice-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voice-call bt-sco" />
     </path>
 
@@ -355,7 +354,7 @@
     </path>
 
     <path name="voice2-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voice2-call bt-sco" />
     </path>
 
@@ -386,7 +385,7 @@
     </path>
 
     <path name="vowlan-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="vowlan-call bt-sco" />
     </path>
 
@@ -406,7 +405,7 @@
     </path>
 
     <path name="voicemmode1-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voicemmode1-call bt-sco" />
     </path>
 
@@ -430,7 +429,7 @@
     </path>
 
     <path name="voicemmode2-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voicemmode2-call bt-sco" />
     </path>
 
@@ -451,7 +450,7 @@
     </path>
 
     <path name="hfp-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="hfp-sco" />
     </path>
 
@@ -516,7 +515,7 @@
     </path>
 
    <path name="volte-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="volte-call bt-sco" />
     </path>
 
@@ -536,7 +535,7 @@
     </path>
 
     <path name="compress-voip-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="compress-voip-call bt-sco" />
     </path>
 
@@ -572,7 +571,7 @@
     </path>
 
     <path name="qchat-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="qchat-call bt-sco" />
     </path>
 
diff --git a/configs/msm8909/mixer_paths_qrd_skut.xml b/configs/msm8909/mixer_paths_qrd_skut.xml
index 60c79b7..1d57cc1 100644
--- a/configs/msm8909/mixer_paths_qrd_skut.xml
+++ b/configs/msm8909/mixer_paths_qrd_skut.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-    Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+    Copyright (c) 2015-2017, 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
@@ -100,7 +100,7 @@
     <ctl name="Voice_Tx Mixer TERT_MI2S_TX_Voice" value="0" />
     <ctl name="PRI_MI2S_RX Port Mixer INT_BT_SCO_TX" value="0" />
     <!-- Voice BTSCO -->
-    <ctl name="Internal BTSCO SampleRate" value="8000" />
+    <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_8KHZ" />
     <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer CSVoice" value="0" />
     <ctl name="Voice_Tx Mixer INTERNAL_BT_SCO_TX_Voice" value="0" />
     <ctl name="INTERNAL_BT_SCO_RX Audio Mixer Multimedia6" value="0" />
@@ -128,7 +128,6 @@
     <!-- Voip -->
     <ctl name="PRI_MI2S_RX_Voice Mixer Voip" value="0" />
     <ctl name="Voip_Tx Mixer TERT_MI2S_TX_Voip" value="0" />
-    <ctl name="Internal BTSCO SampleRate" value="8000" />
     <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="0" />
     <ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="0" />
     <!-- Voip end -->
@@ -201,7 +200,7 @@
     <!-- ADSP testfwk end-->
 
     <path name="bt-sco-wb-samplerate">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
     </path>
 
     <!-- These are audio route (FE to BE) specific mixer settings -->
@@ -214,7 +213,7 @@
     </path>
 
     <path name="deep-buffer-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="deep-buffer-playback bt-sco" />
     </path>
 
@@ -244,7 +243,7 @@
     </path>
 
     <path name="low-latency-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="low-latency-playback bt-sco" />
     </path>
 
@@ -274,7 +273,7 @@
     </path>
 
     <path name="compress-offload-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="compress-offload-playback bt-sco" />
     </path>
 
@@ -312,7 +311,7 @@
     </path>
 
     <path name="audio-record bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="audio-record bt-sco" />
     </path>
 
@@ -343,7 +342,7 @@
     </path>
 
     <path name="voice-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voice-call bt-sco" />
     </path>
 
@@ -363,7 +362,7 @@
     </path>
 
     <path name="voice2-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voice2-call bt-sco" />
     </path>
 
@@ -394,7 +393,7 @@
     </path>
 
     <path name="vowlan-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="vowlan-call bt-sco" />
     </path>
 
@@ -414,7 +413,7 @@
     </path>
 
     <path name="voicemmode1-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voicemmode1-call bt-sco" />
     </path>
 
@@ -438,7 +437,7 @@
     </path>
 
     <path name="voicemmode2-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voicemmode2-call bt-sco" />
     </path>
 
@@ -459,7 +458,7 @@
     </path>
 
     <path name="hfp-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="hfp-sco" />
     </path>
 
@@ -524,7 +523,7 @@
     </path>
 
    <path name="volte-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="volte-call bt-sco" />
     </path>
 
@@ -544,7 +543,7 @@
     </path>
 
     <path name="compress-voip-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="compress-voip-call bt-sco" />
     </path>
 
@@ -580,7 +579,7 @@
     </path>
 
     <path name="qchat-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="qchat-call bt-sco" />
     </path>
 
diff --git a/configs/msm8909/mixer_paths_skua.xml b/configs/msm8909/mixer_paths_skua.xml
index 33efc0b..d529bf8 100644
--- a/configs/msm8909/mixer_paths_skua.xml
+++ b/configs/msm8909/mixer_paths_skua.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-    Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
+    Copyright (c) 2014-2017, 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
@@ -100,7 +100,7 @@
     <ctl name="Voice_Tx Mixer TERT_MI2S_TX_Voice" value="0" />
     <ctl name="PRI_MI2S_RX Port Mixer INT_BT_SCO_TX" value="0" />
     <!-- Voice BTSCO -->
-    <ctl name="Internal BTSCO SampleRate" value="8000" />
+    <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_8KHZ" />
     <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer CSVoice" value="0" />
     <ctl name="Voice_Tx Mixer INTERNAL_BT_SCO_TX_Voice" value="0" />
     <ctl name="INTERNAL_BT_SCO_RX Audio Mixer Multimedia6" value="0" />
@@ -128,7 +128,6 @@
     <!-- Voip -->
     <ctl name="PRI_MI2S_RX_Voice Mixer Voip" value="0" />
     <ctl name="Voip_Tx Mixer TERT_MI2S_TX_Voip" value="0" />
-    <ctl name="Internal BTSCO SampleRate" value="8000" />
     <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="0" />
     <ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="0" />
     <!-- Voip end -->
@@ -201,7 +200,7 @@
     <!-- ADSP testfwk end-->
 
     <path name="bt-sco-wb-samplerate">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
     </path>
 
     <!-- These are audio route (FE to BE) specific mixer settings -->
@@ -214,7 +213,7 @@
     </path>
 
     <path name="deep-buffer-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="deep-buffer-playback bt-sco" />
     </path>
 
@@ -244,7 +243,7 @@
     </path>
 
     <path name="low-latency-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="low-latency-playback bt-sco" />
     </path>
 
@@ -274,7 +273,7 @@
     </path>
 
     <path name="compress-offload-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="compress-offload-playback bt-sco" />
     </path>
 
@@ -312,7 +311,7 @@
     </path>
 
     <path name="audio-record bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="audio-record bt-sco" />
     </path>
 
@@ -343,7 +342,7 @@
     </path>
 
     <path name="voice-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voice-call bt-sco" />
     </path>
 
@@ -363,7 +362,7 @@
     </path>
 
     <path name="voice2-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voice2-call bt-sco" />
     </path>
 
@@ -394,7 +393,7 @@
     </path>
 
     <path name="vowlan-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="vowlan-call bt-sco" />
     </path>
 
@@ -414,7 +413,7 @@
     </path>
 
     <path name="voicemmode1-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voicemmode1-call bt-sco" />
     </path>
 
@@ -438,7 +437,7 @@
     </path>
 
     <path name="voicemmode2-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voicemmode2-call bt-sco" />
     </path>
 
@@ -459,7 +458,7 @@
     </path>
 
     <path name="hfp-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="hfp-sco" />
     </path>
 
@@ -524,7 +523,7 @@
     </path>
 
    <path name="volte-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="volte-call bt-sco" />
     </path>
 
@@ -544,7 +543,7 @@
     </path>
 
     <path name="compress-voip-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="compress-voip-call bt-sco" />
     </path>
 
@@ -580,7 +579,7 @@
     </path>
 
     <path name="qchat-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="qchat-call bt-sco" />
     </path>
 
diff --git a/configs/msm8909/mixer_paths_skuc.xml b/configs/msm8909/mixer_paths_skuc.xml
index 1bdb050..a3d9cc0 100644
--- a/configs/msm8909/mixer_paths_skuc.xml
+++ b/configs/msm8909/mixer_paths_skuc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-    Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
+    Copyright (c) 2014-2017, 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
@@ -100,7 +100,7 @@
     <ctl name="Voice_Tx Mixer TERT_MI2S_TX_Voice" value="0" />
     <ctl name="PRI_MI2S_RX Port Mixer INT_BT_SCO_TX" value="0" />
     <!-- Voice BTSCO -->
-    <ctl name="Internal BTSCO SampleRate" value="8000" />
+    <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_8KHZ" />
     <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer CSVoice" value="0" />
     <ctl name="Voice_Tx Mixer INTERNAL_BT_SCO_TX_Voice" value="0" />
     <ctl name="INTERNAL_BT_SCO_RX Audio Mixer Multimedia6" value="0" />
@@ -128,7 +128,6 @@
     <!-- Voip -->
     <ctl name="PRI_MI2S_RX_Voice Mixer Voip" value="0" />
     <ctl name="Voip_Tx Mixer TERT_MI2S_TX_Voip" value="0" />
-    <ctl name="Internal BTSCO SampleRate" value="8000" />
     <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="0" />
     <ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="0" />
     <!-- Voip end -->
@@ -201,7 +200,7 @@
     <!-- ADSP testfwk end-->
 
     <path name="bt-sco-wb-samplerate">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
     </path>
 
     <!-- These are audio route (FE to BE) specific mixer settings -->
@@ -214,7 +213,7 @@
     </path>
 
     <path name="deep-buffer-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="deep-buffer-playback bt-sco" />
     </path>
 
@@ -244,7 +243,7 @@
     </path>
 
     <path name="low-latency-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="low-latency-playback bt-sco" />
     </path>
 
@@ -274,7 +273,7 @@
     </path>
 
     <path name="compress-offload-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="compress-offload-playback bt-sco" />
     </path>
 
@@ -312,7 +311,7 @@
     </path>
 
     <path name="audio-record bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="audio-record bt-sco" />
     </path>
 
@@ -343,7 +342,7 @@
     </path>
 
     <path name="voice-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voice-call bt-sco" />
     </path>
 
@@ -363,7 +362,7 @@
     </path>
 
     <path name="voice2-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voice2-call bt-sco" />
     </path>
 
@@ -394,7 +393,7 @@
     </path>
 
     <path name="vowlan-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="vowlan-call bt-sco" />
     </path>
 
@@ -414,7 +413,7 @@
     </path>
 
     <path name="voicemmode1-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voicemmode1-call bt-sco" />
     </path>
 
@@ -438,7 +437,7 @@
     </path>
 
     <path name="voicemmode2-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voicemmode2-call bt-sco" />
     </path>
 
@@ -459,7 +458,7 @@
     </path>
 
     <path name="hfp-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="hfp-sco" />
     </path>
 
@@ -524,7 +523,7 @@
     </path>
 
    <path name="volte-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="volte-call bt-sco" />
     </path>
 
@@ -544,7 +543,7 @@
     </path>
 
     <path name="compress-voip-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="compress-voip-call bt-sco" />
     </path>
 
@@ -580,7 +579,7 @@
     </path>
 
     <path name="qchat-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="qchat-call bt-sco" />
     </path>
 
diff --git a/configs/msm8909/mixer_paths_skue.xml b/configs/msm8909/mixer_paths_skue.xml
index e35ddef..e71cfec 100644
--- a/configs/msm8909/mixer_paths_skue.xml
+++ b/configs/msm8909/mixer_paths_skue.xml
@@ -101,7 +101,7 @@
     <ctl name="Voice_Tx Mixer TERT_MI2S_TX_Voice" value="0" />
     <ctl name="PRI_MI2S_RX Port Mixer INT_BT_SCO_TX" value="0" />
     <!-- Voice BTSCO -->
-    <ctl name="Internal BTSCO SampleRate" value="8000" />
+    <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_8KHZ" />
     <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer CSVoice" value="0" />
     <ctl name="Voice_Tx Mixer INTERNAL_BT_SCO_TX_Voice" value="0" />
     <ctl name="INTERNAL_BT_SCO_RX Audio Mixer Multimedia6" value="0" />
@@ -129,7 +129,6 @@
     <!-- Voip -->
     <ctl name="PRI_MI2S_RX_Voice Mixer Voip" value="0" />
     <ctl name="Voip_Tx Mixer TERT_MI2S_TX_Voip" value="0" />
-    <ctl name="Internal BTSCO SampleRate" value="8000" />
     <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="0" />
     <ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="0" />
     <!-- Voip end -->
@@ -202,7 +201,7 @@
     <!-- ADSP testfwk end-->
 
     <path name="bt-sco-wb-samplerate">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
     </path>
 
     <!-- These are audio route (FE to BE) specific mixer settings -->
@@ -215,7 +214,7 @@
     </path>
 
     <path name="deep-buffer-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="deep-buffer-playback bt-sco" />
     </path>
 
@@ -245,7 +244,7 @@
     </path>
 
     <path name="low-latency-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="low-latency-playback bt-sco" />
     </path>
 
@@ -275,7 +274,7 @@
     </path>
 
     <path name="compress-offload-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="compress-offload-playback bt-sco" />
     </path>
 
@@ -313,7 +312,7 @@
     </path>
 
     <path name="audio-record bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="audio-record bt-sco" />
     </path>
 
@@ -344,7 +343,7 @@
     </path>
 
     <path name="voice-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voice-call bt-sco" />
     </path>
 
@@ -364,7 +363,7 @@
     </path>
 
     <path name="voice2-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voice2-call bt-sco" />
     </path>
 
@@ -395,7 +394,7 @@
     </path>
 
     <path name="vowlan-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="vowlan-call bt-sco" />
     </path>
 
@@ -415,7 +414,7 @@
     </path>
 
     <path name="voicemmode1-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voicemmode1-call bt-sco" />
     </path>
 
@@ -439,7 +438,7 @@
     </path>
 
     <path name="voicemmode2-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voicemmode2-call bt-sco" />
     </path>
 
@@ -460,7 +459,7 @@
     </path>
 
     <path name="hfp-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="hfp-sco" />
     </path>
 
@@ -525,7 +524,7 @@
     </path>
 
    <path name="volte-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="volte-call bt-sco" />
     </path>
 
@@ -545,7 +544,7 @@
     </path>
 
     <path name="compress-voip-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="compress-voip-call bt-sco" />
     </path>
 
@@ -581,7 +580,7 @@
     </path>
 
     <path name="qchat-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="qchat-call bt-sco" />
     </path>
 
diff --git a/configs/msm8909/mixer_paths_wcd9326_i2s.xml b/configs/msm8909/mixer_paths_wcd9326_i2s.xml
index da7b149..83fdbc0 100644
--- a/configs/msm8909/mixer_paths_wcd9326_i2s.xml
+++ b/configs/msm8909/mixer_paths_wcd9326_i2s.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.         -->
+<!-- Copyright (c) 2015-2017, 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 -->
@@ -478,6 +478,10 @@
     <!-- ADSP testfwk -->
     <!-- ADSP testfwk end-->
 
+    <path name="bt-sco-wb-samplerate">
+        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+    </path>
+
     <!-- These are audio route (FE to BE) specific mixer settings -->
     <path name="deep-buffer-playback">
         <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia1" value="1" />
@@ -505,7 +509,7 @@
     </path>
 
     <path name="deep-buffer-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <ctl name="SLIM_1 SampleRate" value="16000" />
         <path name="deep-buffer-playback bt-sco" />
     </path>
@@ -548,7 +552,7 @@
     </path>
 
     <path name="low-latency-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <ctl name="SLIM_1 SampleRate" value="16000" />
         <path name="low-latency-playback bt-sco" />
     </path>
@@ -608,7 +612,7 @@
     </path>
 
     <path name="compress-offload-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <ctl name="SLIM_1 SampleRate" value="16000" />
         <path name="compress-offload-playback bt-sco" />
     </path>
@@ -656,7 +660,7 @@
      </path>
 
     <path name="compress-offload-playback2 bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <ctl name="SLIM_1 SampleRate" value="16000" />
         <path name="compress-offload-playback2 bt-sco" />
     </path>
@@ -700,7 +704,7 @@
     </path>
 
     <path name="compress-offload-playback3 bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <ctl name="SLIM_1 SampleRate" value="16000" />
         <path name="compress-offload-playback3 bt-sco" />
     </path>
@@ -744,7 +748,7 @@
     </path>
 
     <path name="compress-offload-playback4 bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <ctl name="SLIM_1 SampleRate" value="16000" />
         <path name="compress-offload-playback4 bt-sco" />
     </path>
@@ -788,7 +792,7 @@
     </path>
 
     <path name="compress-offload-playback5 bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <ctl name="SLIM_1 SampleRate" value="16000" />
         <path name="compress-offload-playback5 bt-sco" />
     </path>
@@ -832,7 +836,7 @@
     </path>
 
     <path name="compress-offload-playback6 bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <ctl name="SLIM_1 SampleRate" value="16000" />
         <path name="compress-offload-playback6 bt-sco" />
     </path>
@@ -876,7 +880,7 @@
     </path>
 
     <path name="compress-offload-playback7 bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <ctl name="SLIM_1 SampleRate" value="16000" />
         <path name="compress-offload-playback7 bt-sco" />
     </path>
@@ -920,7 +924,7 @@
     </path>
 
     <path name="compress-offload-playback8 bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <ctl name="SLIM_1 SampleRate" value="16000" />
         <path name="compress-offload-playback8 bt-sco" />
     </path>
@@ -964,7 +968,7 @@
     </path>
 
     <path name="compress-offload-playback9 bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <ctl name="SLIM_1 SampleRate" value="16000" />
         <path name="compress-offload-playback9 bt-sco" />
     </path>
@@ -1008,7 +1012,7 @@
     </path>
 
     <path name="audio-record bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <ctl name="SLIM_1 SampleRate" value="16000" />
         <path name="audio-record bt-sco" />
     </path>
@@ -1026,7 +1030,7 @@
     </path>
 
     <path name="audio-record-compress bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <ctl name="SLIM_1 SampleRate" value="16000" />
         <path name="audio-record-compress bt-sco" />
     </path>
@@ -1044,7 +1048,7 @@
     </path>
 
     <path name="low-latency-record bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="low-latency-record bt-sco" />
     </path>
 
@@ -1068,7 +1072,7 @@
     </path>
 
     <path name="voice-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voice-call bt-sco" />
     </path>
 
@@ -1098,7 +1102,7 @@
     </path>
 
     <path name="voice2-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voice2-call bt-sco" />
     </path>
 
@@ -1247,7 +1251,7 @@
    </path>
 
    <path name="hfp-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="hfp-sco" />
    </path>
 
@@ -1267,7 +1271,7 @@
     </path>
 
     <path name="volte-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="volte-call bt-sco" />
     </path>
 
@@ -1292,7 +1296,7 @@
     </path>
 
     <path name="compress-voip-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <ctl name="SLIM_1 SampleRate" value="16000" />
         <path name="compress-voip-call bt-sco" />
     </path>
@@ -1323,7 +1327,7 @@
     </path>
 
     <path name="vowlan-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="vowlan-call bt-sco" />
     </path>
 
@@ -1348,7 +1352,7 @@
     </path>
 
     <path name="voicemmode1-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voicemmode1-call bt-sco" />
     </path>
 
@@ -1372,7 +1376,7 @@
     </path>
 
     <path name="voicemmode2-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+        <path name="bt-sco-wb-samplerate" />
         <path name="voicemmode2-call bt-sco" />
     </path>