From 3112ad5dd67bf805ab67ae1164fd761e38a656d5 Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Tue, 30 Aug 2016 19:31:37 -0700
Subject: Path fix for backend connection to FE upon call disconnection

Bug 29316883

Change-Id: I2e96df9ea74fe9f798febf9b4ea70b05d2ae2ecd
---
 mixer_paths.xml | 68 ++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 46 insertions(+), 22 deletions(-)

diff --git a/mixer_paths.xml b/mixer_paths.xml
index dbed7c15..2bb94f84 100644
--- a/mixer_paths.xml
+++ b/mixer_paths.xml
@@ -156,8 +156,36 @@
 	<ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="0" />
 	<!-- usb headset end -->
 	<ctl name="BOOST ENABLE Spkr Left Prot" value="0" />
-	<ctl name="BOOST_STUB Right Mixer right" value="0" />
-	<ctl name="BOOST_STUB Left Mixer left" value="0" />
+	<ctl name="BOOST_STUB Right Mixer right MM_DL1" value="0" />
+	<ctl name="BOOST_STUB Right Mixer right MM_DL2" value="0" />
+	<ctl name="BOOST_STUB Right Mixer right MM_DL3" value="0" />
+	<ctl name="BOOST_STUB Right Mixer right MM_DL4" value="0" />
+	<ctl name="BOOST_STUB Right Mixer right MM_DL5" value="0" />
+	<ctl name="BOOST_STUB Right Mixer right MM_DL6" value="0" />
+	<ctl name="BOOST_STUB Right Mixer right MM_DL7" value="0" />
+	<ctl name="BOOST_STUB Right Mixer right MM_DL8" value="0" />
+	<ctl name="BOOST_STUB Right Mixer right VOIP_DL" value="0" />
+	<ctl name="BOOST_STUB Right Mixer right CS-VOICE_DL1" value="0" />
+	<ctl name="BOOST_STUB Right Mixer right VOICE2_DL" value="0" />
+	<ctl name="BOOST_STUB Right Mixer right VoLTE_DL" value="0" />
+	<ctl name="BOOST_STUB Right Mixer right VOLTE_STUB_DL" value="0" />
+	<ctl name="BOOST_STUB Right Mixer right VOICE_STUB_DL" value="0" />
+	<ctl name="BOOST_STUB Right Mixer right VOICE2_STUB_DL" value="0" />
+	<ctl name="BOOST_STUB Left Mixer left MM_DL1" value="0" />
+	<ctl name="BOOST_STUB Left Mixer left MM_DL2" value="0" />
+	<ctl name="BOOST_STUB Left Mixer left MM_DL3" value="0" />
+	<ctl name="BOOST_STUB Left Mixer left MM_DL4" value="0" />
+	<ctl name="BOOST_STUB Left Mixer left MM_DL5" value="0" />
+	<ctl name="BOOST_STUB Left Mixer left MM_DL6" value="0" />
+	<ctl name="BOOST_STUB Left Mixer left MM_DL7" value="0" />
+	<ctl name="BOOST_STUB Left Mixer left MM_DL8" value="0" />
+	<ctl name="BOOST_STUB Left Mixer left VOIP_DL" value="0" />
+	<ctl name="BOOST_STUB Left Mixer left CS-VOICE_DL1" value="0" />
+	<ctl name="BOOST_STUB Left Mixer left VOICE2_DL" value="0" />
+	<ctl name="BOOST_STUB Left Mixer left VoLTE_DL" value="0" />
+	<ctl name="BOOST_STUB Left Mixer left VOLTE_STUB_DL" value="0" />
+	<ctl name="BOOST_STUB Left Mixer left VOICE_STUB_DL" value="0" />
+	<ctl name="BOOST_STUB Left Mixer left VOICE2_STUB_DL" value="0" />
 	<ctl name="BOOST earpiece mode" value="Off" />
 	<ctl name="QUAT_MI2S_RX Channels" value="One" />
 	<ctl name="BOOST Left Ch Select" value="1" />
@@ -314,6 +342,8 @@
 
 	<path name="deep-buffer-playback speaker">
 		<ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia1" value="1" />
+		<ctl name="BOOST_STUB Right Mixer right MM_DL1" value="1" />
+		<ctl name="BOOST_STUB Left Mixer left MM_DL1" value="1" />
 	</path>
 
 	<path name="deep-buffer-playback handset">
@@ -361,6 +391,8 @@
 
 	<path name="low-latency-playback speaker">
 		<ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia5" value="1" />
+		<ctl name="BOOST_STUB Right Mixer right MM_DL5" value="1" />
+		<ctl name="BOOST_STUB Left Mixer left MM_DL5" value="1" />
 	</path>
 
 	<path name="low-latency-playback handset">
@@ -396,6 +428,8 @@
 
 	<path name="compress-offload-playback speaker">
 		<ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia4" value="1" />
+		<ctl name="BOOST_STUB Right Mixer right MM_DL4" value="1" />
+		<ctl name="BOOST_STUB Left Mixer left MM_DL4" value="1" />
 	</path>
 
 	<path name="compress-offload-playback handset">
@@ -476,6 +510,8 @@
 		<ctl name="QUAT_MI2S_RX_Voice Mixer Voice Stub" value="1" />
 		<ctl name="Voice Stub Tx Mixer STUB_TX_HL" value="1" />
 		<ctl name="Voice Stub Tx Mixer STUB_1_TX_HL" value="1" />
+		<ctl name="BOOST_STUB Right Mixer right VOICE_STUB_DL" value="1" />
+		<ctl name="BOOST_STUB Left Mixer left VOICE_STUB_DL" value="1" />
 	</path>
 
 	<path name="voice-call speaker">
@@ -574,6 +610,8 @@
 		<ctl name="QUAT_MI2S_RX_Voice Mixer VoLTE Stub" value="1" />
 		<ctl name="VoLTE Stub Tx Mixer STUB_TX_HL" value="1" />
 		<ctl name="VoLTE Stub Tx Mixer STUB_1_TX_HL" value="1" />
+		<ctl name="BOOST_STUB Right Mixer right VoLTE_DL" value="1" />
+		<ctl name="BOOST_STUB Left Mixer left VoLTE_DL" value="1" />
 	</path>
 
 	<path name="volte-call speaker">
@@ -736,9 +774,7 @@
 		<!-- Select Right channel on Right IC bypass mode -->
 		<ctl name="BOOST Right Ch Select" value="2" />
 		<!-- Enable Mixers to power up Left and Right IC's -->
-		<ctl name="BOOST_STUB Right Mixer right" value="1" />
-		<ctl name="BOOST_STUB Left Mixer left" value="1" />
-                <path name="speaker-gain-default" />
+		<path name="speaker-gain-default" />
 	</path>
 
 	<path name="speaker-reverse">
@@ -749,9 +785,6 @@
 		<ctl name="BOOST Left Ch Select" value="2" />
 		<!-- Select Right channel on Right IC bypass mode -->
 		<ctl name="BOOST Right Ch Select" value="1" />
-		<!-- Enable Mixers to power up Left and Right IC's -->
-		<ctl name="BOOST_STUB Right Mixer right" value="1" />
-		<ctl name="BOOST_STUB Left Mixer left" value="1" />
 	</path>
 
 	<path name="speaker-safe">
@@ -759,8 +792,7 @@
 		<!-- Select mono channel on Right IC -->
 		<ctl name="BOOST Right Ch Select" value="3" />
 		<!-- Enable Mixers to power up Right IC only -->
-		<ctl name="BOOST_STUB Right Mixer right" value="1" />
-                <path name="speaker-safe-gain-default" />
+		<path name="speaker-safe-gain-default" />
 	</path>
 
 	<path name="speaker-mic">
@@ -780,9 +812,6 @@
 	<path name="handset">
 		<!-- Enable earpiece mode this toggles gpio -->
 		<ctl name="BOOST earpiece mode" value="On" />
-		<!-- Enable Mixer to power up Left IC -->
-		<ctl name="BOOST_STUB Left Mixer left" value="1" />
-		<ctl name="BOOST_STUB Right Mixer right" value="0" />
 		<!-- select (l + r)/2 -->
 		<ctl name="BOOST Left Ch Select" value="3" />
 		<!-- bypass dsp -->
@@ -857,9 +886,6 @@
 	<path name="voice-speaker">
 		<!-- Disable earpiece mode -->
 		<ctl name="BOOST earpiece mode" value="Off" />
-		<!-- Enable Mixer to power up Left IC -->
-		<ctl name="BOOST_STUB Left Mixer left" value="1" />
-		<ctl name="BOOST_STUB Right Mixer right" value="0" />
 		<!-- select (l + r)/2 -->
 		<ctl name="BOOST Left Ch Select" value="3" />
 	</path>
@@ -889,25 +915,23 @@
 		<ctl name="BOOST earpiece mode" value="Off" />
 		<ctl name="BOOST Left Ch Select" value="3" />
 		<ctl name="BOOST Right Ch Select" value="3" />
-		<ctl name="BOOST_STUB Right Mixer right" value="1" />
-		<ctl name="BOOST_STUB Left Mixer left" value="1" />
-                <path name="spkr-gain-in-headphone-combo" />
+		<path name="spkr-gain-in-headphone-combo" />
 	</path>
 
 	<path name="speaker-safe-and-headphones">
 		<path name="speaker-safe" />
 		<path name="headphones" />
-                <path name="spkr-safe-gain-in-headphone-combo" />
+		<path name="spkr-safe-gain-in-headphone-combo" />
 	</path>
 
 	<path name="speaker-and-line">
 		<path name="speaker-and-headphones" />
-                <path name="spkr-gain-in-line-combo" />
+		<path name="spkr-gain-in-line-combo" />
 	</path>
 
 	<path name="speaker-safe-and-line">
 		<path name="speaker-safe-and-headphones" />
-                <path name="spkr-safe-gain-in-line-combo" />
+		<path name="spkr-safe-gain-in-line-combo" />
 	</path>
 
 	<path name="voice-rec-mic">
-- 
cgit v1.2.3