commit 97f44ca266dd8ef0566ad43c7c70cd10c7564445
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Oct 28 05:12:37 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 28 05:12:37 2020 +0000
tree 29770ca1bfb2489983eefabe2b5e4f386a920f7a
parent 92b3da3ee7370bd779819f536d932aa7f014e95a
parent d8bbbc0e0a12471ee30fe78c9bb3c0e61cdd50bf

Merge "audio: separate dapm control on barge-in case" into rvc-qpr-dev

audio/sound_trigger_mixer_paths.xml

diff --git a/audio/sound_trigger_mixer_paths.xml b/audio/sound_trigger_mixer_paths.xml
index d7b62fa..5bfd5a7 100644
--- a/audio/sound_trigger_mixer_paths.xml
+++ b/audio/sound_trigger_mixer_paths.xml
@@ -91,9 +91,9 @@
     <ctl name="EC Reference SampleRate" value="0"/>
     <ctl name="PRI_TDM_TX_0 LSM Function" value="None" />
     <ctl name="PRI_TDM_TX_0 Channels" value="One" />
-    <ctl name="Sto1 ADC MIXL DMIC Switch" value="0" />
-    <ctl name="Sto2 ADC MIXL DMIC Switch" value="0" />
-    <ctl name="Sto2 ADC MIXR DMIC Switch" value="0" />
+    <ctl name="Sto1 ADC MIXL BargeIn DMIC Switch" value="0" />
+    <ctl name="Sto2 ADC MIXL BargeIn DMIC Switch" value="0" />
+    <ctl name="Sto2 ADC MIXR BargeIn DMIC Switch" value="0" />
 
     <path name="listen-voice-wakeup-1">
         <ctl name="PRI_TDM_TX_0 LSM Function" value="AUDIO" />
@@ -259,15 +259,15 @@
         <ctl name="ADC1 Capture Volume" value="23" />
         <ctl name="ADC2 Capture Volume" value="23" />
         <ctl name="PRI_TDM_TX_0 Channels" value="One" />
-        <ctl name="Sto1 ADC MIXL DMIC Switch" value="1" />
+        <ctl name="Sto1 ADC MIXL BargeIn DMIC Switch" value="1" />
     </path>
 
     <path name="listen-ape-handset-dmic">
         <ctl name="ADC1 Capture Volume" value="23"/>
         <ctl name="ADC2 Capture Volume" value="23"/>
         <ctl name="PRI_TDM_TX_0 Channels" value="Two"/>
-        <ctl name="Sto1 ADC MIXL DMIC Switch" value="1" />
-        <ctl name="Sto2 ADC MIXL DMIC Switch" value="1" />
+        <ctl name="Sto1 ADC MIXL BargeIn DMIC Switch" value="1" />
+        <ctl name="Sto2 ADC MIXL BargeIn DMIC Switch" value="1" />
     </path>
 
     <path name="listen-ape-handset-tmic">