From: Srinivas Kandagatla Date: Wed, 25 Jun 2025 11:19:09 +0000 (+0100) Subject: ucm2: codecs: lpass-rx-macro: move mixers that do not belong X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=c887eeb91b8d51887a4cee6c92ed3bb9a00ce8d2;p=alsa-ucm-conf.git 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 Signed-off-by: Jaroslav Kysela --- diff --git a/ucm2/codecs/qcom-lpass/rx-macro/HeadphoneDisableSeq.conf b/ucm2/codecs/qcom-lpass/rx-macro/HeadphoneDisableSeq.conf index d2a5988..88803d1 100644 --- 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 0162b6c..79a7450 100644 --- 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 16b4625..600db73 100644 --- 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 500527d..37d24db 100644 --- 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 ecb2a9b..199373d 100644 --- 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 3929138..e615db9 100644 --- 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 9b66ccf..427e08d 100644 --- 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 f996938..a297a9b 100644 --- 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 37b1faf..06eed79 100644 --- 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 dd8260b..a42ed67 100644 --- 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" ]