From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Date: Thu, 2 Nov 2023 11:31:30 +0000 (+0100)
Subject: ucm2: codecs: wsa-macro: add 2xWSA arrangements
X-Git-Tag: v1.2.11~33
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=8d0f7f2ff2d9be73575f14a3775dad0645ea0b06;p=alsa-ucm-conf.git

ucm2: codecs: wsa-macro: add 2xWSA arrangements

On four-speaker setups we have two instances of WSA macro codecs with
sound-name-prefix ("WSA" and "WSA2").  Add sequences for such
configuration.

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/369
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/ucm2/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerDisableSeq.conf b/ucm2/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerDisableSeq.conf
new file mode 100644
index 0000000..c34b50b
--- /dev/null
+++ b/ucm2/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerDisableSeq.conf
@@ -0,0 +1,10 @@
+DisableSequence [
+#	cset "name='WSA WSA_RX0 Digital Volume' 0"
+#	cset "name='WSA WSA_RX1 Digital Volume' 0"
+	cset "name='WSA WSA_COMP1 Switch' 0"
+	cset "name='WSA WSA_COMP2 Switch' 0"
+	cset "name='WSA WSA_RX0 INP0' ZERO"
+	cset "name='WSA WSA_RX1 INP0' ZERO"
+	cset "name='WSA WSA RX0 MUX' ZERO"
+	cset "name='WSA WSA RX1 MUX' ZERO"
+]
diff --git a/ucm2/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerEnableSeq.conf b/ucm2/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerEnableSeq.conf
new file mode 100644
index 0000000..a619ed6
--- /dev/null
+++ b/ucm2/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerEnableSeq.conf
@@ -0,0 +1,10 @@
+EnableSequence [
+	cset "name='WSA WSA RX0 MUX' AIF1_PB"
+	cset "name='WSA WSA RX1 MUX' AIF1_PB"
+	cset "name='WSA WSA_RX0 INP0' RX0"
+	cset "name='WSA WSA_RX1 INP0' RX1"
+	cset "name='WSA WSA_COMP1 Switch' 1"
+	cset "name='WSA WSA_COMP2 Switch' 1"
+	#cset "name='WSA WSA_RX0 Digital Volume' 68"
+	#cset "name='WSA WSA_RX1 Digital Volume' 68"
+]
diff --git a/ucm2/codecs/qcom-lpass/wsa-macro/Wsa2SpeakerDisableSeq.conf b/ucm2/codecs/qcom-lpass/wsa-macro/Wsa2SpeakerDisableSeq.conf
new file mode 100644
index 0000000..2c8dda7
--- /dev/null
+++ b/ucm2/codecs/qcom-lpass/wsa-macro/Wsa2SpeakerDisableSeq.conf
@@ -0,0 +1,10 @@
+DisableSequence [
+#	cset "name='WSA2 WSA_RX0 Digital Volume' 0"
+#	cset "name='WSA2 WSA_RX1 Digital Volume' 0"
+	cset "name='WSA2 WSA_COMP1 Switch' 0"
+	cset "name='WSA2 WSA_COMP2 Switch' 0"
+	cset "name='WSA2 WSA_RX0 INP0' ZERO"
+	cset "name='WSA2 WSA_RX1 INP0' ZERO"
+	cset "name='WSA2 WSA RX0 MUX' ZERO"
+	cset "name='WSA2 WSA RX1 MUX' ZERO"
+]
diff --git a/ucm2/codecs/qcom-lpass/wsa-macro/Wsa2SpeakerEnableSeq.conf b/ucm2/codecs/qcom-lpass/wsa-macro/Wsa2SpeakerEnableSeq.conf
new file mode 100644
index 0000000..af1cd66
--- /dev/null
+++ b/ucm2/codecs/qcom-lpass/wsa-macro/Wsa2SpeakerEnableSeq.conf
@@ -0,0 +1,10 @@
+EnableSequence [
+	cset "name='WSA2 WSA RX0 MUX' AIF1_PB"
+	cset "name='WSA2 WSA RX1 MUX' AIF1_PB"
+	cset "name='WSA2 WSA_RX0 INP0' RX0"
+	cset "name='WSA2 WSA_RX1 INP0' RX1"
+	cset "name='WSA2 WSA_COMP1 Switch' 1"
+	cset "name='WSA2 WSA_COMP2 Switch' 1"
+	#cset "name='WSA2 WSA_RX0 Digital Volume' 68"
+	#cset "name='WSA2 WSA_RX1 Digital Volume' 68"
+]
diff --git a/ucm2/codecs/qcom-lpass/wsa-macro/four-speakers/init.conf b/ucm2/codecs/qcom-lpass/wsa-macro/four-speakers/init.conf
new file mode 100644
index 0000000..3be2407
--- /dev/null
+++ b/ucm2/codecs/qcom-lpass/wsa-macro/four-speakers/init.conf
@@ -0,0 +1,8 @@
+# WSA Digital codec specific volume control settings
+
+BootSequence [
+	cset "name='WSA WSA_RX0 Digital Volume' 84"
+	cset "name='WSA WSA_RX1 Digital Volume' 84"
+	cset "name='WSA2 WSA_RX0 Digital Volume' 84"
+	cset "name='WSA2 WSA_RX1 Digital Volume' 84"
+]