From 3350ddf869f57c518a7c95c7a0440fcfa84e0bd3 Mon Sep 17 00:00:00 2001
From: syphyr <syphyr@gmail.com>
Date: Sun, 19 Aug 2018 20:41:47 +0200
Subject: [PATCH] gts210velte: Switch to mixer_paths.xml from T819XXU2BRE1

* Previously we have been using mixer_paths_01.xml which
  turned out to be invalid configuration for this device.

Change-Id: Iad2b92377fca84a65382f2a38a0f21e2d9e8b7c6
(cherry picked from commit 2d1172589fe9e280edb618dadecb80ed563e07e5)
---
 audio/mixer_paths_wcd9330.xml | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/audio/mixer_paths_wcd9330.xml b/audio/mixer_paths_wcd9330.xml
index 9fddb2a..77181ab 100644
--- a/audio/mixer_paths_wcd9330.xml
+++ b/audio/mixer_paths_wcd9330.xml
@@ -990,16 +990,29 @@
     </path>
 
     <path name="ear">
-        <ctl name="Stereo DAC MIXL DAC R1 Switch" value="1"/>
-        <ctl name="Stereo DAC MIXR DAC L1 Switch" value="1"/>
+        <ctl name="Stereo DAC MIXL DAC L1 Switch" value="1"/>
+        <ctl name="Stereo DAC MIXR DAC R1 Switch" value="1"/>
         <ctl name="HPO L Playback Switch" value="1"/>
         <ctl name="HPO R Playback Switch" value="1"/>
         <ctl name="HP Switch" value="1" />
     </path>
 
     <path name="spk-ear">
-        <path name="spk" />
-        <path name="ear" />
+        <ctl name="Stereo DAC MIXL DAC L1 Switch" value="1"/>
+        <ctl name="Stereo DAC MIXR DAC R1 Switch" value="1"/>
+        <ctl name="DAC L2 Source" value="Stereo DAC Mixer"/>
+        <ctl name="DAC R2 Source" value="Stereo DAC Mixer"/>
+        <ctl name="SPK MIXL DAC L2 Switch" value="1"/>
+        <ctl name="SPK MIXR DAC R2 Switch" value="1"/>	
+        <ctl name="SPO L MIX SPKVOL L Switch" value="1"/>
+        <ctl name="SPO R MIX SPKVOL R Switch" value="1"/>
+        <ctl name="SPKVOL L Switch" value="1"/>
+        <ctl name="SPKVOL R Switch" value="1"/>
+        <ctl name="SPO Playback Switch" value="1"/>
+        <ctl name="SPK Switch" value="1" />
+        <ctl name="HPO L Playback Switch" value="1"/>
+        <ctl name="HPO R Playback Switch" value="1"/>
+        <ctl name="HP Switch" value="1" />
     </path>
 
     <!-- TX part -->
@@ -1077,7 +1090,7 @@
     <path name="speaker">
         <path name="spk" />
             <ctl name="DAC1 Playback Volume" value="175"/>
-            <ctl name="Speaker Playback Volume" value="31"/>
+            <ctl name="Speaker Playback Volume" value="30"/>
     </path>
 
     <path name="headset">
@@ -1088,8 +1101,8 @@
 
     <path name="speaker-and-headphones">
         <path name="spk-ear" />
-            <ctl name="DAC1 Playback Volume" value="170"/>
-            <ctl name="Speaker Playback Volume" value="31"/>
+            <ctl name="DAC1 Playback Volume" value="160"/>
+            <ctl name="Speaker Playback Volume" value="34"/>
             <ctl name="Headphone Playback Volume" value="0"/>			
     </path>
 
@@ -1111,7 +1124,7 @@
             <ctl name="DAC1 Playback Volume" value="175"/>
             <ctl name="Speaker Playback Volume" value="30"/>			
     </path>
-	
+    
     <path name="speaker-and-proxy">
         <path name="spk" />
             <ctl name="DAC1 Playback Volume" value="175"/>
@@ -1136,7 +1149,7 @@
     <!-- Recording Scenario  -->
     <path name="rec-main-mic">
         <path name="main-mic" />
-            <ctl name="IN3 Boost Volume" value="38"/>
+            <ctl name="IN3 Boost Volume" value="37"/>
             <ctl name="STO1 ADC Capture Volume" value="47"/>
     </path>
 
@@ -2265,7 +2278,7 @@
     <path name="loopback-speaker-DSP">
         <path name="spk" />
             <ctl name="DAC1 Playback Volume" value="175"/>
-            <ctl name="Speaker Playback Volume" value="36"/>		
+            <ctl name="Speaker Playback Volume" value="33"/>		
     </path>
 
     <path name="loopback-headset-DSP">
@@ -2301,7 +2314,7 @@
     <!-- TX part -->
     <path name="loopback-main-mic-DSP">
         <path name="main-mic" />
-            <ctl name="IN3 Boost Volume" value="34"/>
+            <ctl name="IN3 Boost Volume" value="38"/>
             <ctl name="STO1 ADC Capture Volume" value="47"/>
     </path>