Fixups to mako HiFi UCM config

Changes include:

  * Move volume setup to verb enable time instead of individual devices
    like the Android mixer XML

  * Enable/disable tx mixer control on mic device enable/disable just as
    we do with the rx mixer for playback devices

  * Optimise mixer enable/disable by not re-enabling the mixer in
    DisableSquence (it'll get enabled in the following EnableSequence on
    device switch)

1 files changed, 36 insertions, 30 deletions

diff --git a/data/alsa/ucm/apq8064-tabla-snd-card/HiFi b/data/alsa/ucm/apq8064-tabla-snd-card/HiFi
index 39f7d0a..4a10669 100644
--- a/data/alsa/ucm/apq8064-tabla-snd-card/HiFi
+++ b/data/alsa/ucm/apq8064-tabla-snd-card/HiFi
@@ -4,6 +4,23 @@ SectionVerb {
 
 		cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1"
 		cset "name='MultiMedia1 Mixer SLIM_0_TX' 1"
+
+		# Default values
+		cset "name='LINEOUT1 Volume' 84"
+		cset "name='LINEOUT3 Volume' 84"
+		cset "name='HPHL Volume' 6"
+		cset "name='HPHR Volume' 6"
+		cset "name='RX1 Digital Volume' 84"
+		cset "name='RX2 Digital Volume' 84"
+		cset "name='RX3 Digital Volume' 84"
+		cset "name='ADC1 Volume' 3"
+		cset "name='ADC2 Volume' 3"
+		cset "name='ADC3 Volume' 3"
+		cset "name='DEC7 Volume' 84"
+		cset "name='DEC8 Volume' 84"
+		cset "name='DEC9 Volume' 84"
+		cset "name='MICBIAS1 CAPLESS Switch' 1"
+
 	]
 
 	DisableSequence [
@@ -40,7 +57,6 @@ SectionDevice."Earpiece" {
 		cset "name='SLIM_0_RX Channels' One"
 		cset "name='RX1 MIX1 INP1' RX1"
 		cset "name='RX1 MIX1 INP2' RX1"
-		cset "name='RX1 Digital Volume' 68"
 		cset "name='EAR PA Gain' POS_6_DB"
 		cset "name='DAC1 Switch' 1"
 		cset "name='SLIM TX3 MUX' RMIX1"
@@ -57,12 +73,10 @@ SectionDevice."Earpiece" {
 
 		cset "name='RX1 MIX1 INP1' ZERO"
 		cset "name='RX1 MIX1 INP2' ZERO"
-		cset "name='RX1 Digital Volume' 68"
 		cset "name='DAC1 Switch' 0"
 		cset "name='SLIM TX3 MUX' ZERO"
 
-		# See comment in EnableSequence
-		cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1"
+		# Re-enabled in EnableSequence
 	]
 
 	#ACDBID	7:1
@@ -93,9 +107,6 @@ SectionDevice."Speaker" {
 		cset "name='RX3 MIX1 INP1' RX1"
 		cset "name='RX3 MIX1 INP2' RX6"
 		cset "name='RX4 DSM MUX' DSM_INV"
-		cset "name='RX3 Digital Volume' 68"
-		cset "name='LINEOUT1 Volume' 100"
-		cset "name='LINEOUT3 Volume' 100"
 		cset "name='SLIM TX3 MUX' RMIX3"
 
 		# Route has been set up, re-enable the mixer.
@@ -111,13 +122,9 @@ SectionDevice."Speaker" {
 		cset "name='RX3 MIX1 INP1' ZERO"
 		cset "name='RX3 MIX1 INP2' ZERO"
 		cset "name='RX4 DSM MUX' CIC_OUT"
-		cset "name='RX3 Digital Volume' 68"
-		cset "name='LINEOUT1 Volume' 0"
-		cset "name='LINEOUT3 Volume' 0"
 		cset "name='SLIM TX3 MUX' ZERO"
 
-		# See comment in EnableSequence
-		cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1"
+		# Re-enabled in EnableSequence
 	]
 
 	#ACDBID	14:1
@@ -151,10 +158,6 @@ SectionDevice."Headphones" {
 		cset "name='RX2 MIX1 INP2' RX7"
 		cset "name='HPHL DAC Switch' 1"
 		#FIXME ENOEXIST: cset "name='HPHR DAC Switch' 1"
-		cset "name='RX1 Digital Volume' 68"
-		cset "name='RX2 Digital Volume' 68"
-		cset "name='HPHL Volume' 50"
-		cset "name='HPHR Volume' 50"
 		cset "name='SLIM TX3 MUX' RMIX1"
 		cset "name='SLIM TX5 MUX' RMIX2"
 
@@ -174,15 +177,10 @@ SectionDevice."Headphones" {
 		cset "name='RX2 MIX1 INP2' ZERO"
 		cset "name='HPHL DAC Switch' 0"
 		#FIXME ENOEXIST: cset "name='HPHR DAC Switch' 0"
-		cset "name='RX1 Digital Volume' 68"
-		cset "name='RX2 Digital Volume' 68"
-		cset "name='HPHL Volume' 0"
-		cset "name='HPHR Volume' 0"
 		cset "name='SLIM TX3 MUX' ZERO"
 		cset "name='SLIM TX5 MUX' ZERO"
 
-		# See comment in EnableSequence
-		cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1"
+		# Re-enabled in EnableSequence
 	]
 
 	#ACDBID	10:1
@@ -205,18 +203,24 @@ SectionDevice."HeadsetMic" {
 	EnableSequence [
 		cdev "hw:apq8064tablasnd"
 
+		cset "name='MultiMedia1 Mixer SLIM_0_TX' 0"
+
 		cset "name='SLIM_0_TX Channels' One"
 		cset "name='SLIM TX7 MUX' DEC8"
 		cset "name='DEC8 MUX' ADC2"
-		cset "name='ADC2 Volume' 66"
+
+		cset "name='MultiMedia1 Mixer SLIM_0_TX' 1"
 	]
 
 	DisableSequence [
 		cdev "hw:apq8064tablasnd"
 
+		cset "name='MultiMedia1 Mixer SLIM_0_TX' 0"
+
 		cset "name='SLIM TX7 MUX' ZERO"
 		cset "name='DEC8 MUX' ZERO"
-		cset "name='ADC2 Volume' 0"
+
+		# Re-enabled in EnableSequence
 	]
 
 	#ACDBID	8:2
@@ -239,22 +243,24 @@ SectionDevice."HandsetMic" {
 	EnableSequence [
 		cdev "hw:apq8064tablasnd"
 
+		cset "name='MultiMedia1 Mixer SLIM_0_TX' 0"
+
 		cset "name='SLIM_0_TX Channels' One"
 		cset "name='SLIM TX7 MUX' DEC7"
 		cset "name='DEC7 MUX' ADC1"
-		cset "name='DEC7 Volume' 80"
-		cset "name='ADC1 Volume' 100"
-		cset "name='MICBIAS1 CAPLESS Switch' 0"
+
+		cset "name='MultiMedia1 Mixer SLIM_0_TX' 1"
 	]
 
 	DisableSequence [
 		cdev "hw:apq8064tablasnd"
 
+		cset "name='MultiMedia1 Mixer SLIM_0_TX' 0"
+
 		cset "name='SLIM TX7 MUX' ZERO"
 		cset "name='DEC7 MUX' ZERO"
-		cset "name='DEC7 Volume' 0"
-		cset "name='ADC1 Volume' 0"
-		cset "name='MICBIAS1 CAPLESS Switch' 1"
+
+		# Re-enabled in EnableSequence
 	]
 
 	#ACDBID	4:2