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 4b6f3e787ccdb4009622a6bcf7680ac9e7a2aff8..2dc5f2eee7df2b6120d4d87553bb6e3c082c2eda 100644 (file)
--- 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 0206e87f313bf345623a284c3015356bbc2ade11..16b4625685fcb388ae5e87afaa3c86e25210b6ca 100644 (file)
--- 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 5ce7950b9dc25b3bf4ca951f95faab3c293755e3..500527d1e7a81105e71dca713c5eac66111a5f41 100644 (file)
--- 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 5558446b7bd9d3455bf60ceacb76a42f5711c143..fa87c477f69f89f47a51ea0c5c702583b62b8fba 100644 (file)
--- 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 ad43830d668e5fd557cc9fd6b18a3439065501ec..a40c580a00a4bc161806b4d1276c45dd3417d860 100644 (file)
--- 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 92f9dea30a07c325765b5a7fbb79e0446521f512..0d2e01156f1524c26c1de41cb7421f67d5918388 100644 (file)
--- 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 2d8d01a39fe512f818b9972ecdd53eb8e5742877..587e7c21072d7606696fe81447fafafc73217ff6 100644 (file)
--- 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 (file)
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
+               }
+       }
+}
+