commit a3f1ab7f2f10bb5731e49540e43e2153a31ff9ce
author qctecmdr <qctecmdr@localhost> Fri May 01 02:49:00 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri May 01 02:49:00 2020 -0700
tree f49f3488e80b4da978712ab31a932172c47cd2de
parent 276336b577d9114c12d6939bf2e4ebd62cac59e6
parent 0891bbaf65e8c2f8907c3d074bad8a9eec75ede6

Merge "configs: Add DEFAULT adm_config profile"

configs/bengal/mixer_paths_scubaidp.xml

diff --git a/configs/bengal/mixer_paths_scubaidp.xml b/configs/bengal/mixer_paths_scubaidp.xml
index 7ffefea..acf1dd7 100644
--- a/configs/bengal/mixer_paths_scubaidp.xml
+++ b/configs/bengal/mixer_paths_scubaidp.xml
@@ -2611,6 +2611,8 @@
         <ctl name="HPHR_COMP Switch" value="1" />
         <ctl name="HPHL_RDAC Switch" value="1" />
         <ctl name="HPHR_RDAC Switch" value="1" />
+        <ctl name="RX_RX0 Digital Volume" value="65" />
+        <ctl name="RX_RX1 Digital Volume" value="65" />
     </path>
 
     <path name="headphones-44.1">
@@ -2714,13 +2716,27 @@
     </path>
 
     <path name="speaker-and-headphones">
-        <path name="headphones" />
-        <path name="speaker" />
+        <ctl name="RX_MACRO RX0 MUX" value="AIF1_PB" />
+        <ctl name="RX_MACRO RX1 MUX" value="AIF1_PB" />
+        <ctl name="RX_CDC_DMA_RX_0 Channels" value="Two" />
+        <ctl name="RX INT0_1 MIX1 INP0" value="RX0" />
+        <ctl name="RX INT1_1 MIX1 INP0" value="RX1" />
+        <ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />
+        <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="HPHL_COMP Switch" value="1" />
+        <ctl name="HPHR_COMP Switch" value="1" />
+        <ctl name="HPHL_RDAC Switch" value="1" />
+        <ctl name="HPHR_RDAC Switch" value="1" />
+        <ctl name="LO_RDAC Switch" value="1" />
+        <ctl name="SpkrMono WSA_RDAC" value="Switch" />
+        <ctl name="RX_RX0 Digital Volume" value="65" />
+        <ctl name="RX_RX1 Digital Volume" value="65" />
     </path>
 
     <path name="speaker-and-headphones-hifi-filter">
-        <path name="headphones" />
-        <path name="speaker" />
+        <path name="speaker-and-headphones" />
     </path>
 
     <path name="speaker-safe-and-headphones">
@@ -2737,8 +2753,7 @@
     </path>
 
     <path name="speaker-and-headphones-liquid">
-        <path name="headphones" />
-        <path name="speaker" />
+        <path name="speaker-and-headphones" />
     </path>
 
     <path name="speaker-safe-and-headphones-liquid">

configs/bengal/mixer_paths_scubaqrd.xml

diff --git a/configs/bengal/mixer_paths_scubaqrd.xml b/configs/bengal/mixer_paths_scubaqrd.xml
index 6c983ce..fd681a6 100644
--- a/configs/bengal/mixer_paths_scubaqrd.xml
+++ b/configs/bengal/mixer_paths_scubaqrd.xml
@@ -2496,7 +2496,6 @@
         <ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />
         <ctl name="LO_RDAC Switch" value="1" />
         <ctl name="SpkrMono WSA_RDAC" value="Switch" />
-        <ctl name="LO_RDAC Switch" value="1" />
     </path>
 
     <path name="speaker-mono">
@@ -2589,6 +2588,8 @@
         <ctl name="HPHR_COMP Switch" value="1" />
         <ctl name="HPHL_RDAC Switch" value="1" />
         <ctl name="HPHR_RDAC Switch" value="1" />
+        <ctl name="RX_RX0 Digital Volume" value="65" />
+        <ctl name="RX_RX1 Digital Volume" value="65" />
     </path>
 
     <path name="headphones-44.1">
@@ -2694,13 +2695,27 @@
     </path>
 
     <path name="speaker-and-headphones">
-        <path name="headphones" />
-        <path name="speaker" />
+        <ctl name="RX_MACRO RX0 MUX" value="AIF1_PB" />
+        <ctl name="RX_MACRO RX1 MUX" value="AIF1_PB" />
+        <ctl name="RX_CDC_DMA_RX_0 Channels" value="Two" />
+        <ctl name="RX INT0_1 MIX1 INP0" value="RX0" />
+        <ctl name="RX INT1_1 MIX1 INP0" value="RX1" />
+        <ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />
+        <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="HPHL_COMP Switch" value="1" />
+        <ctl name="HPHR_COMP Switch" value="1" />
+        <ctl name="HPHL_RDAC Switch" value="1" />
+        <ctl name="HPHR_RDAC Switch" value="1" />
+        <ctl name="LO_RDAC Switch" value="1" />
+        <ctl name="SpkrMono WSA_RDAC" value="Switch" />
+        <ctl name="RX_RX0 Digital Volume" value="65" />
+        <ctl name="RX_RX1 Digital Volume" value="65" />
     </path>
 
     <path name="speaker-and-headphones-hifi-filter">
-        <path name="headphones" />
-        <path name="speaker" />
+        <path name="speaker-and-headphones" />
     </path>
 
     <path name="speaker-safe-and-headphones">
@@ -2717,8 +2732,7 @@
     </path>
 
     <path name="speaker-and-headphones-liquid">
-        <path name="headphones" />
-        <path name="speaker" />
+        <path name="speaker-and-headphones" />
     </path>
 
     <path name="speaker-safe-and-headphones-liquid">