z2_plus: audio: Update config from @cosmedd

Signed-off-by: dd3boh <dade.garberi@gmail.com>

3 files changed, 19 insertions, 22 deletions

diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml
index 7b8dbae..174ad4f 100644
--- a/audio/audio_policy_configuration.xml
+++ b/audio/audio_policy_configuration.xml
@@ -3,13 +3,10 @@
      Not a Contribution.
 -->
 <!-- Copyright (C) 2015 The Android Open Source Project
-
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-
           http://www.apache.org/licenses/LICENSE-2.0
-
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/audio/mixer_paths_tasha.xml b/audio/mixer_paths_tasha.xml
index 7c311ef..f648aba 100644
--- a/audio/mixer_paths_tasha.xml
+++ b/audio/mixer_paths_tasha.xml
@@ -26,15 +26,15 @@
     <ctl name="LINEOUT4 Volume" value="13" />
     <ctl name="HPHL Volume" value="12" />
     <ctl name="HPHR Volume" value="12" />
-    <ctl name="RX0 Digital Volume" value="87" />
-    <ctl name="RX1 Digital Volume" value="87" />
-    <ctl name="RX2 Digital Volume" value="87" />
-    <ctl name="RX3 Digital Volume" value="87" />
-    <ctl name="RX4 Digital Volume" value="87" />
-    <ctl name="RX5 Digital Volume" value="87" />
-    <ctl name="RX6 Digital Volume" value="87" />
-    <ctl name="RX7 Digital Volume" value="87" />
-    <ctl name="RX8 Digital Volume" value="87" />
+    <ctl name="RX0 Digital Volume" value="84" />
+    <ctl name="RX1 Digital Volume" value="84" />
+    <ctl name="RX2 Digital Volume" value="84" />
+    <ctl name="RX3 Digital Volume" value="84" />
+    <ctl name="RX4 Digital Volume" value="84" />
+    <ctl name="RX5 Digital Volume" value="84" />
+    <ctl name="RX6 Digital Volume" value="84" />
+    <ctl name="RX7 Digital Volume" value="84" />
+    <ctl name="RX8 Digital Volume" value="84" />
     <ctl name="ADC1 Volume" value="12" />
     <ctl name="ADC2 Volume" value="12" />
     <ctl name="ADC3 Volume" value="12" />
@@ -2209,8 +2209,8 @@
         <ctl name="SLIM TX8 MUX" value="DEC8" />
         <ctl name="ADC MUX8" value="AMIC" />
         <ctl name="AMIC MUX8" value="ADC3" />
-        <ctl name="ADC1 Volume" value="25" />
-	      <ctl name="ADC3 Volume" value="25" />
+        <ctl name="ADC1 Volume" value="10" />
+	      <ctl name="ADC3 Volume" value="10" />
         <ctl name="SLIM_0_TX Channels" value="Two" />
     </path>
 
diff --git a/audio/sound_trigger_mixer_paths.xml b/audio/sound_trigger_mixer_paths.xml
index 0125371..8b72d81 100644
--- a/audio/sound_trigger_mixer_paths.xml
+++ b/audio/sound_trigger_mixer_paths.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!--- Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.       -->
+<!--- Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.            -->
 <!---                                                                           -->
 <!--- Redistribution and use in source and binary forms, with or without        -->
 <!--- modification, are permitted provided that the following conditions are    -->
@@ -91,13 +91,6 @@
         <ctl name="CPE AFE MAD Enable" value="1"/>
     </path>
 
-    <path name="listen-cpe-handset-mic-ecpp">
-        <ctl name="CLK MODE" value="INTERNAL" />
-        <ctl name="EC BUF MUX INP" value="DEC1" />
-        <ctl name="ADC MUX1" value="DMIC" />
-        <ctl name="DMIC MUX1" value="DMIC0" />
-    </path>
-
     <!-- path name used for low bandwidth FTRT codec interface -->
     <path name="listen-cpe-handset-mic low-speed-intf">
         <ctl name="MADONOFF Switch" value="1" />
@@ -106,6 +99,13 @@
         <ctl name="CPE AFE MAD Enable" value="1"/>
     </path>
 
+    <path name="listen-cpe-handset-mic-ecpp">
+        <ctl name="CLK MODE" value="INTERNAL" />
+        <ctl name="EC BUF MUX INP" value="DEC1" />
+        <ctl name="ADC MUX1" value="DMIC" />
+        <ctl name="DMIC MUX1" value="DMIC0" />
+    </path>
+
     <path name="listen-ape-handset-mic">
         <ctl name="MAD_BROADCAST Switch" value="1" />
         <ctl name="TX13 INP MUX" value="MAD_BRDCST" />