From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Date: Tue, 2 Feb 2021 16:52:50 +0000 (+0000)
Subject: ucm2: codecs: wcd934x: Add enable disable sequences
X-Git-Tag: v1.2.8~16
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=1f29f44bd3a2fb6ef272edb8b11138183210f9ad;p=alsa-ucm-conf.git

ucm2: codecs: wcd934x: Add enable disable sequences

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/ucm2/codecs/wcd934x/DefaultEnableSeq.conf b/ucm2/codecs/wcd934x/DefaultEnableSeq.conf
index 4b6f3e7..2dc5f2e 100644
--- a/ucm2/codecs/wcd934x/DefaultEnableSeq.conf
+++ b/ucm2/codecs/wcd934x/DefaultEnableSeq.conf
@@ -1,16 +1,10 @@
 EnableSequence [
+	cset "name='SLIM RX0 MUX' AIF1_PB"
 	cset "name='SLIM RX1 MUX' AIF1_PB"
-	cset "name='SLIM RX2 MUX' AIF1_PB"
-	cset "name='SLIM RX6 MUX' ZERO"
-	cset "name='SLIM RX7 MUX' ZERO"
-	cset "name='SLIM RX3 MUX' ZERO"
-	cset "name='SLIM RX4 MUX' ZERO"
-	cset "name='SLIM RX5 MUX' ZERO"
-	cset "name='AIF1_CAP Mixer SLIM TX0' 1"
+	cset "name='SLIM RX2 MUX' AIF2_PB"
+	cset "name='SLIM RX3 MUX' AIF2_PB"
+
 
-	cset "name='RX INT7_1 MIX1 INP0' RX1"
-	cset "name='RX INT8_1 MIX1 INP0' RX2"
-	cset "name='RX INT1_2 MUX' RX1"
-	cset "name='RX INT2_2 MUX' RX2"
+	cset "name='AIF1_CAP Mixer SLIM TX0' 1"
 	cset "name='CDC_IF TX0 MUX' DEC0"
 ]
diff --git a/ucm2/codecs/wcd934x/HeadphoneDisableSeq.conf b/ucm2/codecs/wcd934x/HeadphoneDisableSeq.conf
index 0206e87..16b4625 100644
--- a/ucm2/codecs/wcd934x/HeadphoneDisableSeq.conf
+++ b/ucm2/codecs/wcd934x/HeadphoneDisableSeq.conf
@@ -1,6 +1,8 @@
-cset "name='COMP1 Switch' 0"
-cset "name='COMP2 Switch' 0"
-cset "name='RX1 Digital Volume' 0"
-cset "name='RX2 Digital Volume' 0"
-cset "name='RX INT1 DEM MUX' ZERO"
-cset "name='RX INT2 DEM MUX' ZERO"
+DisableSequence [
+	cset "name='COMP1 Switch' 0"
+	cset "name='COMP2 Switch' 0"
+	cset "name='RX INT1_1 MIX1 INP0' ZERO"
+	cset "name='RX INT2_1 MIX1 INP0' ZERO"
+	cset "name='RX INT1 DEM MUX' NORMAL_DSM_OUT"
+	cset "name='RX INT2 DEM MUX' NORMAL_DSM_OUT"
+]
diff --git a/ucm2/codecs/wcd934x/HeadphoneEnableSeq.conf b/ucm2/codecs/wcd934x/HeadphoneEnableSeq.conf
index 5ce7950..500527d 100644
--- a/ucm2/codecs/wcd934x/HeadphoneEnableSeq.conf
+++ b/ucm2/codecs/wcd934x/HeadphoneEnableSeq.conf
@@ -1,6 +1,8 @@
-cset "name='COMP1 Switch' 1"
-cset "name='COMP2 Switch' 1"
-cset "name='RX INT1 DEM MUX' CLSH_DSM_OUT"
-cset "name='RX INT2 DEM MUX' CLSH_DSM_OUT"
-cset "name='RX1 Digital Volume' 68"
-cset "name='RX2 Digital Volume' 68"
+EnableSequence [
+	cset "name='COMP1 Switch' 1"
+	cset "name='COMP2 Switch' 1"
+	cset "name='RX INT1_1 MIX1 INP0' RX2"
+	cset "name='RX INT2_1 MIX1 INP0' RX3"
+	cset "name='RX INT1 DEM MUX' CLSH_DSM_OUT"
+	cset "name='RX INT2 DEM MUX' CLSH_DSM_OUT"
+]
diff --git a/ucm2/codecs/wcd934x/HeadphoneMicDisableSeq.conf b/ucm2/codecs/wcd934x/HeadphoneMicDisableSeq.conf
index 5558446..fa87c47 100644
--- a/ucm2/codecs/wcd934x/HeadphoneMicDisableSeq.conf
+++ b/ucm2/codecs/wcd934x/HeadphoneMicDisableSeq.conf
@@ -1,2 +1,4 @@
-cset "name='AMIC MUX0' ZERO"
-cset "name='ADC2 Volume' 0"
+DisableSequence [
+	cset "name='AMIC MUX0' ZERO"
+	cset "name='ADC2 Volume' 0"
+]
diff --git a/ucm2/codecs/wcd934x/HeadphoneMicEnableSeq.conf b/ucm2/codecs/wcd934x/HeadphoneMicEnableSeq.conf
index ad43830..a40c580 100644
--- a/ucm2/codecs/wcd934x/HeadphoneMicEnableSeq.conf
+++ b/ucm2/codecs/wcd934x/HeadphoneMicEnableSeq.conf
@@ -1,3 +1,4 @@
-cset "name='AMIC MUX0' ADC2"
-cset "name='ADC2 Volume' 12"
-cset "name='ADC MUX0' AMIC"
+EnableSequence [
+	cset "name='AMIC MUX0' ADC2"
+	cset "name='ADC MUX0' AMIC"
+]
diff --git a/ucm2/codecs/wcd934x/SpeakerDisableSeq.conf b/ucm2/codecs/wcd934x/SpeakerDisableSeq.conf
index 92f9dea..0d2e011 100644
--- a/ucm2/codecs/wcd934x/SpeakerDisableSeq.conf
+++ b/ucm2/codecs/wcd934x/SpeakerDisableSeq.conf
@@ -1,6 +1,6 @@
 DisableSequence [
-	cset "name='RX7 Digital Volume' 0"
-	cset "name='RX8 Digital Volume' 0"
 	cset "name='COMP7 Switch' 0"
 	cset "name='COMP8 Switch' 0"
-]
\ No newline at end of file
+	cset "name='RX INT7_1 MIX1 INP0' ZERO"
+	cset "name='RX INT8_1 MIX1 INP0' ZERO"
+]
diff --git a/ucm2/codecs/wcd934x/SpeakerEnableSeq.conf b/ucm2/codecs/wcd934x/SpeakerEnableSeq.conf
index 2d8d01a..587e7c2 100644
--- a/ucm2/codecs/wcd934x/SpeakerEnableSeq.conf
+++ b/ucm2/codecs/wcd934x/SpeakerEnableSeq.conf
@@ -1,6 +1,6 @@
 EnableSequence [
 	cset "name='COMP7 Switch' 1"
 	cset "name='COMP8 Switch' 1"
-	cset "name='RX7 Digital Volume' 80"
-	cset "name='RX8 Digital Volume' 80"
+	cset "name='RX INT7_1 MIX1 INP0' RX0"
+	cset "name='RX INT8_1 MIX1 INP0' RX1"
 ]
diff --git a/ucm2/codecs/wcd934x/init.conf b/ucm2/codecs/wcd934x/init.conf
new file mode 100644
index 0000000..aa8e46a
--- /dev/null
+++ b/ucm2/codecs/wcd934x/init.conf
@@ -0,0 +1,25 @@
+# WCD934X specific volume control settings
+
+BootSequence [
+	cset "name='RX1 Digital Volume' 80"
+	cset "name='RX2 Digital Volume' 80"
+	cset "name='RX7 Digital Volume' 80"
+	cset "name='RX8 Digital Volume' 80"
+	cset "name='ADC2 Volume' 12"
+]
+
+LibraryConfig.remap.Config {
+
+	ctl.default.map {
+		# Merge two mono controls into one stereo
+		"name='HP Digital Volume'" {
+			"name='RX1 Digital Volume'".vindex.0 0
+			"name='RX2 Digital Volume'".vindex.1 0
+		}
+		"name='Speaker Digital Volume'" {
+			"name='RX7 Digital Volume'".vindex.0 0
+			"name='RX8 Digital Volume'".vindex.1 0
+		}
+	}
+}
+