From e9cbc5821fbdd05d96d563c4ae378ee4c1aaa02f Mon Sep 17 00:00:00 2001
From: matteo0026 <marmotta200026@gmail.com>
Date: Sat, 20 Mar 2021 17:35:14 +0100
Subject: [PATCH] matisse-common: cleanup mixer_paths

Delete some not existent controls and some duplicates
---
 audio/mixer_paths.xml | 37 -------------------------------------
 1 file changed, 37 deletions(-)

diff --git a/audio/mixer_paths.xml b/audio/mixer_paths.xml
index a508fca..6f30a51 100644
--- a/audio/mixer_paths.xml
+++ b/audio/mixer_paths.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <mixer>
-	<!-- SM-T231_EUR_XX (Millet) ======================================= -->
 	<!-- These are the initial mixer settings -->
 	<!-- reset RX part -->
 	<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="0" />
@@ -16,24 +15,15 @@
 	<ctl name="SLIM RX3 MUX" value="ZERO" />
 	<ctl name="SLIM RX4 MUX" value="ZERO" />
 	<ctl name="SLIM RX5 MUX" value="ZERO" />
-	<ctl name="SLIM RX6 MUX" value="ZERO" />
-	<ctl name="SLIM RX7 MUX" value="ZERO" />
 
 	<ctl name="RX2 MIX2 INP2" value="ZERO" />
 	<ctl name="RX2 MIX2 INP1" value="ZERO" />
 	<ctl name="RX1 MIX2 INP2" value="ZERO" />
 	<ctl name="RX1 MIX2 INP1" value="ZERO" />
-	<ctl name="RX7 MIX1 INP2" value="ZERO" />
-	<ctl name="RX7 MIX1 INP1" value="ZERO" />
-	<ctl name="RX6 MIX1 INP2" value="ZERO" />
-	<ctl name="RX6 MIX1 INP1" value="ZERO" />
-	<ctl name="RX5 MIX1 INP2" value="ZERO" />
-	<ctl name="RX5 MIX1 INP1" value="ZERO" />
 	<ctl name="RX4 MIX1 INP2" value="ZERO" />
 	<ctl name="RX4 MIX1 INP1" value="ZERO" />
 	<ctl name="RX3 MIX1 INP2" value="ZERO" />
 	<ctl name="RX3 MIX1 INP1" value="ZERO" />
-	<ctl name="RX2 MIX1 INP2" value="ZERO" />
 	<ctl name="RX2 MIX1 INP1" value="ZERO" />
 	<ctl name="RX1 MIX1 INP3" value="ZERO" />
 	<ctl name="RX1 MIX1 INP2" value="ZERO" />
@@ -53,26 +43,14 @@
 	<ctl name="MultiMedia5 Mixer AFE_PCM_TX" value="0" />
 	<ctl name="MultiMedia1 Mixer MI2S_TX" value="0" />
 	<ctl name="MultiMedia1 Mixer SLIM_0_TX" value="0" />
-	<ctl name="MultiMedia1 Mixer SLIM_4_TX" value="0" />
 	<ctl name="MultiMedia1 Mixer INTERNAL_BT_SCO_TX" value="0" />
 
-	<ctl name="SLIM TX10 MUX" value="ZERO" />
-	<ctl name="SLIM TX9 MUX" value="ZERO" />
-	<ctl name="SLIM TX8 MUX" value="ZERO" />
-	<ctl name="SLIM TX7 MUX" value="ZERO" />
-	<ctl name="SLIM TX6 MUX" value="ZERO" />
 	<ctl name="SLIM TX5 MUX" value="ZERO" />
 	<ctl name="SLIM TX4 MUX" value="ZERO" />
 	<ctl name="SLIM TX3 MUX" value="ZERO" />
 	<ctl name="SLIM TX2 MUX" value="ZERO" />
 	<ctl name="SLIM TX1 MUX" value="ZERO" />
 
-	<ctl name="DEC10 MUX" value="ZERO" />
-	<ctl name="DEC9 MUX" value="ZERO" />
-	<ctl name="DEC8 MUX" value="ZERO" />
-	<ctl name="DEC7 MUX" value="ZERO" />
-	<ctl name="DEC6 MUX" value="ZERO" />
-	<ctl name="DEC5 MUX" value="ZERO" />
 	<ctl name="DEC4 MUX" value="ZERO" />
 	<ctl name="DEC3 MUX" value="ZERO" />
 	<ctl name="DEC2 MUX" value="ZERO" />
@@ -351,7 +329,6 @@
 	<!-- ================================================================ -->
 	<!-- Recording Scenario	-->
 	<path name="rec-main-mic">
-		<ctl name="Main Mic Delay" value="4" />
 		<path name="main-mic" />
 		<ctl name="ADC1 Volume" value="23" />
 		<ctl name="DEC1 Volume" value="84" />
@@ -370,9 +347,7 @@
 	</path>
 
 	<path name="rec-stereo-mic">
-		<ctl name="Main Mic Delay" value="4" />
 		<path name="main-mic" />
-		<path name="sub-mic" />
 		<ctl name="SLIM_0_TX Channels" value="Two" />
 		<ctl name="ADC1 Volume" value="100" />
 		<ctl name="DEC1 Volume" value="84" />
@@ -398,9 +373,7 @@
 	</path>
 
 	<path name="rec-high-gain-stereo-mic">
-		<ctl name="Main Mic Delay" value="4" />
 		<path name="main-mic" />
-		<path name="sub-mic" />
 		<ctl name="SLIM_0_TX Channels" value="Two" />
 		<ctl name="ADC1 Volume" value="100" />
 		<ctl name="DEC1 Volume" value="84" />
@@ -454,7 +427,6 @@
 
 	<path name="bargein1-NS-mic">
 		<path name="main-mic" />
-		<path name="sub-mic" />
 		<ctl name="SLIM_0_TX Channels" value="Two" />
 		<ctl name="ADC4 Volume" value="12" />
 		<ctl name="DEC1 Volume" value="84" />
@@ -488,7 +460,6 @@
 
 	<path name="bargein2-NS-mic">
 		<path name="main-mic" />
-		<path name="sub-mic" />
 		<ctl name="SLIM_0_TX Channels" value="Two" />
 		<ctl name="ADC4 Volume" value="12" />
 		<ctl name="DEC1 Volume" value="84" />
@@ -574,7 +545,6 @@
 
 	<path name="voice-call-NS-mic-handset">
 		<path name="main-mic" />
-		<path name="sub-mic" />
 		<ctl name="SLIM_0_TX Channels" value="Two" />
 		<ctl name="ADC1 Volume" value="19" />
 		<ctl name="DEC1 Volume" value="84" />
@@ -584,7 +554,6 @@
 
 	<path name="voice-call-NS-mic-speaker">
 		<path name="sub-mic" />
-		<path name="3rd-mic" />
 		<ctl name="SLIM_0_TX Channels" value="Two" />
 		<ctl name="ADC4 Volume" value="16" />
 		<ctl name="DEC1 Volume" value="84" />
@@ -679,7 +648,6 @@
 
 	<path name="video-call-NS-mic-handset">
 		<path name="main-mic" />
-		<path name="sub-mic" />
 		<ctl name="SLIM_0_TX Channels" value="Two" />
 		<ctl name="ADC1 Volume" value="19" />
 		<ctl name="DEC1 Volume" value="84" />
@@ -689,7 +657,6 @@
 
 	<path name="video-call-NS-mic-speaker">
 		<path name="sub-mic" />
-		<path name="3rd-mic" />
 		<ctl name="SLIM_0_TX Channels" value="Two" />
 		<ctl name="ADC4 Volume" value="16" />
 		<ctl name="DEC1 Volume" value="84" />
@@ -762,7 +729,6 @@
 
 	<path name="VoLTE-voice-NS-mic-handset">
 		<path name="main-mic" />
-		<path name="sub-mic" />
 		<ctl name="SLIM_0_TX Channels" value="Two" />
 		<ctl name="ADC1 Volume" value="19" />
 		<ctl name="DEC1 Volume" value="84" />
@@ -772,7 +738,6 @@
 
 	<path name="VoLTE-voice-NS-mic-speaker">
 		<path name="sub-mic" />
-		<path name="3rd-mic" />
 		<ctl name="SLIM_0_TX Channels" value="Two" />
 		<ctl name="ADC4 Volume" value="16" />
 		<ctl name="DEC1 Volume" value="84" />
@@ -845,7 +810,6 @@
 
 	<path name="VoLTE-video-NS-mic-handset">
 		<path name="main-mic" />
-		<path name="sub-mic" />
 		<ctl name="SLIM_0_TX Channels" value="Two" />
 		<ctl name="ADC1 Volume" value="19" />
 		<ctl name="DEC1 Volume" value="84" />
@@ -855,7 +819,6 @@
 
 	<path name="VoLTE-video-NS-mic-speaker">
 		<path name="sub-mic" />
-		<path name="3rd-mic" />
 		<ctl name="SLIM_0_TX Channels" value="Two" />
 		<ctl name="ADC4 Volume" value="16" />
 		<ctl name="DEC1 Volume" value="84" />