commit db99721722bd06c6980f64f2cf17750d6641b0bd
author Xiaojun Sang <xsang@codeaurora.org> Mon Feb 20 14:59:19 2017 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Feb 22 01:47:06 2017 -0800
tree 569d0718d9891970b0ca80b95aae945c70a8a9b8
parent 506f7c419ca6e2dd5958481236ee0393a8ca0c36

configs: msm8998: change mic assignment and update a2dp

1. Change microphone assigment for endfire and three-mic
scenario.
2. Use MultiMedia8 as FE platform driver for ULL playback over a2dp

CRs-Fixed: 2008319
Change-Id: Ia75d94055fa14d3612fced82e52885a7b1df71d5

configs/msm8998/mixer_paths_skuk.xml

diff --git a/configs/msm8998/mixer_paths_skuk.xml b/configs/msm8998/mixer_paths_skuk.xml
index 6a94965..6f620e3 100644
--- a/configs/msm8998/mixer_paths_skuk.xml
+++ b/configs/msm8998/mixer_paths_skuk.xml
@@ -1824,7 +1824,7 @@
     </path>
 
     <path name="speaker-mic">
-        <path name="dmic2" />
+        <path name="dmic1" />
     </path>
 
     <path name="speaker-mic-liquid">
@@ -1891,13 +1891,13 @@
         <ctl name="SLIM_0_TX Channels" value="Three" />
         <ctl name="CDC_IF TX0 MUX" value="DEC0" />
         <ctl name="ADC MUX0" value="DMIC" />
-        <ctl name="DMIC MUX" value="DMIC0" />
+        <ctl name="DMIC MUX" value="DMIC1" />
         <ctl name="CDC_IF TX1 MUX" value="DEC1" />
         <ctl name="ADC MUX1" value="DMIC" />
-        <ctl name="DMIC MUX1" value="DMIC1" />
+        <ctl name="DMIC MUX1" value="DMIC2" />
         <ctl name="CDC_IF TX2 MUX" value="DEC2" />
         <ctl name="ADC MUX2" value="DMIC" />
-        <ctl name="DMIC MUX2" value="DMIC2" />
+        <ctl name="DMIC MUX2" value="DMIC4" />
     </path>
 
     <path name="anc-handset">
@@ -2151,11 +2151,8 @@
         <ctl name="DMIC MUX8" value="DMIC4" />
         <ctl name="CDC_IF TX9 MUX" value="DEC7" />
         <ctl name="ADC MUX7" value="DMIC" />
-        <ctl name="DMIC MUX7" value="DMIC0" />
+        <ctl name="DMIC MUX7" value="DMIC1" />
         <ctl name="IIR0 INP0 MUX" value="DEC6" />
-        <ctl name="ADC MUX10" value="DMIC" />
-        <ctl name="DMIC MUX10" value="DMIC4" />
-        <ctl name="ANC0 FB MUX" value="ANC_IN_EAR_SPKR" />
     </path>
 
     <!-- Dual MIC devices -->
@@ -2275,10 +2272,10 @@
         <ctl name="SLIM_0_TX Channels" value="Four" />
         <ctl name="CDC_IF TX5 MUX" value="DEC5" />
         <ctl name="ADC MUX5" value="DMIC" />
-        <ctl name="DMIC MUX5" value="DMIC1" />
+        <ctl name="DMIC MUX5" value="DMIC0" />
         <ctl name="CDC_IF TX6 MUX" value="DEC6" />
         <ctl name="ADC MUX6" value="DMIC" />
-        <ctl name="DMIC MUX6" value="DMIC0" />
+        <ctl name="DMIC MUX6" value="DMIC1" />
         <ctl name="CDC_IF TX7 MUX" value="DEC7" />
         <ctl name="ADC MUX7" value="DMIC" />
         <ctl name="DMIC MUX7" value="DMIC2" />
@@ -2410,7 +2407,7 @@
     </path>
 
     <path name="audio-ull-playback bt-a2dp">
-        <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia3" value="1" />
+        <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia8" value="1" />
     </path>
 
     <path name="deep-buffer-playback speaker-and-bt-a2dp">