commit 907cd073343a923b61f4c9c19df9737d8c4d1c4e
author Linux Build Service Account <lnxbuild@localhost> Wed Jun 15 07:44:24 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jun 15 07:44:24 2016 -0700
tree a4045a3d0fae290dbe071e6c935b80d9c1642860
parent 12c5cde7f77336b40078d0216e8537cedcd93bf5
parent 773406df63c3f60428329f28a03afd6a6d6b6bbe

Merge "audio: Add support for CPE AFE MAD control" into av-userspace.lnx.2.0-dev

configs/msm8953/sound_trigger_mixer_paths_wcd9330.xml

diff --git a/configs/msm8953/sound_trigger_mixer_paths_wcd9330.xml b/configs/msm8953/sound_trigger_mixer_paths_wcd9330.xml
index 5587e01..b64c4ca 100644
--- a/configs/msm8953/sound_trigger_mixer_paths_wcd9330.xml
+++ b/configs/msm8953/sound_trigger_mixer_paths_wcd9330.xml
@@ -40,6 +40,7 @@
     <ctl name="SLIMBUS_5_TX LSM Function" value="None" />
     <ctl name="MADONOFF Switch" value="0" />
     <ctl name="MAD Input" value="DMIC1" />
+    <ctl name="CPE AFE MAD Enable" value="0"/>
 
     <path name="listen-voice-wakeup-1">
         <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
@@ -78,6 +79,7 @@
     <path name="listen-cpe-handset-mic">
         <ctl name="MADONOFF Switch" value="1" />
         <ctl name="MAD Input" value="DMIC1" />
+        <ctl name="CPE AFE MAD Enable" value="1"/>
     </path>
 
     <path name="listen-ape-handset-mic">

configs/msm8953/sound_trigger_mixer_paths_wcd9335.xml

diff --git a/configs/msm8953/sound_trigger_mixer_paths_wcd9335.xml b/configs/msm8953/sound_trigger_mixer_paths_wcd9335.xml
index 19a282a..aaf2981 100644
--- a/configs/msm8953/sound_trigger_mixer_paths_wcd9335.xml
+++ b/configs/msm8953/sound_trigger_mixer_paths_wcd9335.xml
@@ -44,6 +44,7 @@
     <ctl name="TX13 INP MUX" value="CDC_DEC_5" />
     <ctl name="AIF4_MAD Mixer SLIM TX12" value="0" />
     <ctl name="AIF4_MAD Mixer SLIM TX13" value="0" />
+    <ctl name="CPE AFE MAD Enable" value="0"/>
 
     <path name="listen-voice-wakeup-1">
         <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
@@ -84,6 +85,7 @@
         <ctl name="TX13 INP MUX" value="CPE_TX_PP" />
         <ctl name="AIF4_MAD Mixer SLIM TX13" value="1" />
         <ctl name="MAD Input" value="DMIC0" />
+        <ctl name="CPE AFE MAD Enable" value="1"/>
     </path>
 
     <!-- path name used for low bandwidth FTRT codec interface -->
@@ -91,6 +93,7 @@
         <ctl name="MADONOFF Switch" value="1" />
         <ctl name="AIF4_MAD Mixer SLIM TX12" value="1" />
         <ctl name="MAD Input" value="DMIC0" />
+        <ctl name="CPE AFE MAD Enable" value="1"/>
      </path>
 
     <path name="listen-ape-handset-mic">