ucm2: codecs: lpass-rx-macro: move mixers that do not belong

Some of the mixers endedup in rx-macro which actually are part of WCD
codecs.
Move such mixers to their respective codecs.

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/585
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/codecs/qcom-lpass/rx-macro/HeadphoneDisableSeq.conf b/ucm2/codecs/qcom-lpass/rx-macro/HeadphoneDisableSeq.conf
index d2a5988608a301a68c3aac2264a3e5a34a51a37a..88803d1f443984f18c21cc7a9e04a8f21ef06f7a 100644 (file)
--- a/ucm2/codecs/qcom-lpass/rx-macro/HeadphoneDisableSeq.conf
+++ b/ucm2/codecs/qcom-lpass/rx-macro/HeadphoneDisableSeq.conf
@@ -7,5 +7,4 @@ DisableSequence [
        cset "name='RX INT1 DEM MUX' NORMAL_DSM_OUT"
        cset "name='RX_COMP1 Switch' 0"
        cset "name='RX_COMP2 Switch' 0"
-       cset "name='RX HPH Mode' CLS_H_INVALID"
 ]

diff --git a/ucm2/codecs/qcom-lpass/rx-macro/HeadphoneEnableSeq.conf b/ucm2/codecs/qcom-lpass/rx-macro/HeadphoneEnableSeq.conf
index 0162b6cbaba96e1a59d59c09c725925906acfb15..79a7450f8f08f865ea119318c4b135cda9c2f36a 100644 (file)
--- a/ucm2/codecs/qcom-lpass/rx-macro/HeadphoneEnableSeq.conf
+++ b/ucm2/codecs/qcom-lpass/rx-macro/HeadphoneEnableSeq.conf
@@ -1,6 +1,5 @@
 EnableSequence [
        cset "name='RX_HPH PWR Mode' LOHIFI"
-       cset "name='RX HPH Mode' CLS_H_ULP"
        cset "name='RX_MACRO RX0 MUX' AIF1_PB"
        cset "name='RX_MACRO RX1 MUX' AIF1_PB"
        cset "name='RX INT0_1 MIX1 INP0' RX0"

diff --git a/ucm2/codecs/wcd934x/HeadphoneDisableSeq.conf b/ucm2/codecs/wcd934x/HeadphoneDisableSeq.conf
index 16b4625685fcb388ae5e87afaa3c86e25210b6ca..600db73cd8528e597040ddf798376dafa435913f 100644 (file)
--- a/ucm2/codecs/wcd934x/HeadphoneDisableSeq.conf
+++ b/ucm2/codecs/wcd934x/HeadphoneDisableSeq.conf
@@ -5,4 +5,5 @@ DisableSequence [
        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"
+       cset "name='RX HPH Mode' CLS_H_INVALID"
 ]

diff --git a/ucm2/codecs/wcd934x/HeadphoneEnableSeq.conf b/ucm2/codecs/wcd934x/HeadphoneEnableSeq.conf
index 500527d1e7a81105e71dca713c5eac66111a5f41..37d24db25dc453578b6b54f643bfa67fe1e4392c 100644 (file)
--- a/ucm2/codecs/wcd934x/HeadphoneEnableSeq.conf
+++ b/ucm2/codecs/wcd934x/HeadphoneEnableSeq.conf
@@ -5,4 +5,5 @@ EnableSequence [
        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"
+       cset "name='RX HPH Mode' CLS_H_ULP"
 ]

diff --git a/ucm2/codecs/wcd937x/HeadphoneDisableSeq.conf b/ucm2/codecs/wcd937x/HeadphoneDisableSeq.conf
index ecb2a9bbe7298b9ae58f24d78fcae211f0d65657..199373dc078a3c2fe8a35e3a4c6dae3aa8c663f8 100644 (file)
--- a/ucm2/codecs/wcd937x/HeadphoneDisableSeq.conf
+++ b/ucm2/codecs/wcd937x/HeadphoneDisableSeq.conf
@@ -3,4 +3,5 @@ DisableSequence [
        cset "name='HPHR_RDAC Switch' 0"
        cset "name='HPHL Switch' 0"
        cset "name='HPHR Switch' 0"
+       cset "name='RX HPH Mode' CLS_H_INVALID"
 ]

diff --git a/ucm2/codecs/wcd937x/HeadphoneEnableSeq.conf b/ucm2/codecs/wcd937x/HeadphoneEnableSeq.conf
index 39291383e2990bc322739a04ec05715c024754fe..e615db9e3bb4878b6cfed6b28670edfaa1578ab4 100644 (file)
--- a/ucm2/codecs/wcd937x/HeadphoneEnableSeq.conf
+++ b/ucm2/codecs/wcd937x/HeadphoneEnableSeq.conf
@@ -3,4 +3,5 @@ EnableSequence [
        cset "name='HPHR_RDAC Switch' 1"
        cset "name='HPHL Switch' 1"
        cset "name='HPHR Switch' 1"
+       cset "name='RX HPH Mode' CLS_H_ULP"
 ]

diff --git a/ucm2/codecs/wcd938x/HeadphoneDisableSeq.conf b/ucm2/codecs/wcd938x/HeadphoneDisableSeq.conf
index 9b66ccf496f18d3a08bf4bed183c2b989a5c194e..427e08da428f4926b6b627239f8fd5ba9a61f7ce 100644 (file)
--- a/ucm2/codecs/wcd938x/HeadphoneDisableSeq.conf
+++ b/ucm2/codecs/wcd938x/HeadphoneDisableSeq.conf
@@ -5,4 +5,5 @@ DisableSequence [
        cset "name='HPHR Switch' 0"
        cset "name='CLSH Switch' 0"
        cset "name='LO Switch' 0"
+       cset "name='RX HPH Mode' CLS_H_INVALID"
 ]

diff --git a/ucm2/codecs/wcd938x/HeadphoneEnableSeq.conf b/ucm2/codecs/wcd938x/HeadphoneEnableSeq.conf
index f99693800b19d70fa5664b7729652e0bba78995c..a297a9b6bd2d9ff0ea7ae1138398728aff960931 100644 (file)
--- a/ucm2/codecs/wcd938x/HeadphoneEnableSeq.conf
+++ b/ucm2/codecs/wcd938x/HeadphoneEnableSeq.conf
@@ -7,4 +7,5 @@ EnableSequence [
        cset "name='HPHL_COMP Switch' 0"
        cset "name='CLSH Switch' 1"
        cset "name='LO Switch' 1"
+       cset "name='RX HPH Mode' CLS_H_ULP"
 ]

diff --git a/ucm2/codecs/wcd939x/HeadphoneDisableSeq.conf b/ucm2/codecs/wcd939x/HeadphoneDisableSeq.conf
index 37b1faf8648df8caa2917dfac8eaf4ac82528e25..06eed7996dd2d8b3db9187cf670334b9d2d26440 100644 (file)
--- a/ucm2/codecs/wcd939x/HeadphoneDisableSeq.conf
+++ b/ucm2/codecs/wcd939x/HeadphoneDisableSeq.conf
@@ -6,4 +6,5 @@ DisableSequence [
        cset "name='HPHL Switch' 0"
        cset "name='HPHR Switch' 0"
        cset "name='CLSH Switch' 0"
+       cset "name='RX HPH Mode' CLS_H_INVALID"
 ]

diff --git a/ucm2/codecs/wcd939x/HeadphoneEnableSeq.conf b/ucm2/codecs/wcd939x/HeadphoneEnableSeq.conf
index dd8260b1005a08e01f1c4f26490d09ffacbb6c1f..a42ed67b8651ebe8b79fa4bebdcefd44f7baba8d 100644 (file)
--- a/ucm2/codecs/wcd939x/HeadphoneEnableSeq.conf
+++ b/ucm2/codecs/wcd939x/HeadphoneEnableSeq.conf
@@ -6,4 +6,5 @@ EnableSequence [
        cset "name='HPHL Switch' 1"
        cset "name='HPHR Switch' 1"
        cset "name='CLSH Switch' 1"
+       cset "name='RX HPH Mode' CLS_H_ULP"
 ]