ucm2: codecs: lpass-wsa-macro: disable WSA_COMP

The compander does not seem to work correctly on many of the platforms
currently in use with upstream software. Particularly some very annoying
"boominess on attacks" is heard on X Elite laptops when it's on.

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/670
Signed-off-by: Val Packett <val@packett.cool>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/codecs/qcom-lpass/wsa-macro/SpeakerDisableSeq.conf b/ucm2/codecs/qcom-lpass/wsa-macro/SpeakerDisableSeq.conf
index 98cf061ee8e206da26950d3b43ccb3a2fe84545d..139d67ef4b76066eda2dcd068242c283fe8beaad 100644 (file)
--- a/ucm2/codecs/qcom-lpass/wsa-macro/SpeakerDisableSeq.conf
+++ b/ucm2/codecs/qcom-lpass/wsa-macro/SpeakerDisableSeq.conf
@@ -1,6 +1,4 @@
 DisableSequence [
-       cset "name='WSA_COMP1 Switch' 0"
-       cset "name='WSA_COMP2 Switch' 0"
        cset "name='WSA_RX0 INP0' ZERO"
        cset "name='WSA_RX1 INP0' ZERO"
        cset "name='WSA RX0 MUX' ZERO"

diff --git a/ucm2/codecs/qcom-lpass/wsa-macro/SpeakerEnableSeq.conf b/ucm2/codecs/qcom-lpass/wsa-macro/SpeakerEnableSeq.conf
index 488826b8b81b9dcc71f32943eaa1a05956717e06..5b5938df2611bcba8478fdc364e02b152f7f067b 100644 (file)
--- a/ucm2/codecs/qcom-lpass/wsa-macro/SpeakerEnableSeq.conf
+++ b/ucm2/codecs/qcom-lpass/wsa-macro/SpeakerEnableSeq.conf
@@ -3,6 +3,4 @@ EnableSequence [
        cset "name='WSA RX1 MUX' AIF1_PB"
        cset "name='WSA_RX0 INP0' RX0"
        cset "name='WSA_RX1 INP0' RX1"
-       cset "name='WSA_COMP1 Switch' 1"
-       cset "name='WSA_COMP2 Switch' 1"
 ]

diff --git a/ucm2/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerDisableSeq.conf b/ucm2/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerDisableSeq.conf
index c34b50b83f90877de8ba0f0463dcf84da8a398b4..a40ac534e67612dcd2c56140adbdd106237e9383 100644 (file)
--- a/ucm2/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerDisableSeq.conf
+++ b/ucm2/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerDisableSeq.conf
@@ -1,8 +1,6 @@
 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"

diff --git a/ucm2/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerEnableSeq.conf b/ucm2/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerEnableSeq.conf
index a619ed68e2e28fc543ab7364ff8658f2e884d17b..7c71c3afbb71f48e08c634b7304f71ad5fb5b142 100644 (file)
--- a/ucm2/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerEnableSeq.conf
+++ b/ucm2/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerEnableSeq.conf
@@ -3,8 +3,6 @@ EnableSequence [
        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
index 2c8dda7012c1f416f5fc47aed74cc465a8511ff8..c2bf706fe7c4cb7f8e13a8e50959824436712778 100644 (file)
--- a/ucm2/codecs/qcom-lpass/wsa-macro/Wsa2SpeakerDisableSeq.conf
+++ b/ucm2/codecs/qcom-lpass/wsa-macro/Wsa2SpeakerDisableSeq.conf
@@ -1,8 +1,6 @@
 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"

diff --git a/ucm2/codecs/qcom-lpass/wsa-macro/Wsa2SpeakerEnableSeq.conf b/ucm2/codecs/qcom-lpass/wsa-macro/Wsa2SpeakerEnableSeq.conf
index af1cd66556ffa7b0df50a82461220c6c66e4900f..8f86489a1c1ad08636993b2bea28098b59ecef1e 100644 (file)
--- a/ucm2/codecs/qcom-lpass/wsa-macro/Wsa2SpeakerEnableSeq.conf
+++ b/ucm2/codecs/qcom-lpass/wsa-macro/Wsa2SpeakerEnableSeq.conf
@@ -3,8 +3,6 @@ EnableSequence [
        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
index 3be24079f8de4d489e0ed8cf4bb49233814d2c2d..38bc4882f022092674f1a35cf7e3462ceaecab61 100644 (file)
--- a/ucm2/codecs/qcom-lpass/wsa-macro/four-speakers/init.conf
+++ b/ucm2/codecs/qcom-lpass/wsa-macro/four-speakers/init.conf
@@ -3,6 +3,10 @@
 BootSequence [
        cset "name='WSA WSA_RX0 Digital Volume' 84"
        cset "name='WSA WSA_RX1 Digital Volume' 84"
+       cset "name='WSA WSA_COMP1 Switch' 0"
+       cset "name='WSA WSA_COMP2 Switch' 0"
        cset "name='WSA2 WSA_RX0 Digital Volume' 84"
        cset "name='WSA2 WSA_RX1 Digital Volume' 84"
+       cset "name='WSA2 WSA_COMP1 Switch' 0"
+       cset "name='WSA2 WSA_COMP2 Switch' 0"
 ]

diff --git a/ucm2/codecs/qcom-lpass/wsa-macro/init.conf b/ucm2/codecs/qcom-lpass/wsa-macro/init.conf
index 29f7c39521fde59fb3600a96c771c4ecd5ae8cc5..c1dedb142e58a185e7b989d31eefc73a1b49f177 100644 (file)
--- a/ucm2/codecs/qcom-lpass/wsa-macro/init.conf
+++ b/ucm2/codecs/qcom-lpass/wsa-macro/init.conf
@@ -3,4 +3,6 @@
 BootSequence [
        cset "name='WSA_RX0 Digital Volume' 84"
        cset "name='WSA_RX1 Digital Volume' 84"
+       cset "name='WSA_COMP1 Switch' 0"
+       cset "name='WSA_COMP2 Switch' 0"
 ]