ucm2: Qualcomm: sc8280xp/x1e80100: fix default volume settings

Default volume settings should be specified in the BootSequence rather
than in device enable sequences to allow users to override the defaults.

Add machine specific BootSequences to set up reasonable defaults for the
Lenovo ThinkPad X13s and X1E80100 CRD. Note that the settings depends on
the actual hardware configuration and should therefore not be specified
in the (potentially shared) codec init files.

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/382
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/Qualcomm/sc8280xp/HiFi.conf b/ucm2/Qualcomm/sc8280xp/HiFi.conf
index 0fb53024cdcb736b2b610e45b68e2136a982c433..b40d671236d72e6911742727258e8c961329cc64 100644 (file)
--- a/ucm2/Qualcomm/sc8280xp/HiFi.conf
+++ b/ucm2/Qualcomm/sc8280xp/HiFi.conf
@@ -9,7 +9,6 @@ SectionVerb {
                cset "name='MultiMedia3 Mixer TX_CODEC_DMA_TX_3' 1"
        ]
 
-       Include.wcde.File "/codecs/wcd938x/DefaultEnableSeq.conf"
        Include.wsae.File "/codecs/wsa883x/DefaultEnableSeq.conf"
 
        Value {

diff --git a/ucm2/Qualcomm/sc8280xp/LENOVO-X13s.conf b/ucm2/Qualcomm/sc8280xp/LENOVO-X13s.conf
index 10e914b586019e27bdecd0797f3ca9cefc1f16bc..c01fb4c2adeb1d5453b3105dfa17ccc6e2fc6ad3 100644 (file)
--- a/ucm2/Qualcomm/sc8280xp/LENOVO-X13s.conf
+++ b/ucm2/Qualcomm/sc8280xp/LENOVO-X13s.conf
@@ -5,6 +5,14 @@ SectionUseCase."HiFi" {
        Comment "HiFi quality Music."
 }
 
+BootSequence [
+       cset "name='SpkrLeft PA Volume' 12"
+       cset "name='SpkrRight PA Volume' 12"
+       cset "name='HPHL Volume' 20"
+       cset "name='HPHR Volume' 20"
+       cset "name='ADC2 Volume' 10"
+]
+
 Include.card-init.File "/lib/card-init.conf"
 Include.ctl-remap.File "/lib/ctl-remap.conf"
 Include.wcd-init.File "/codecs/wcd938x/init.conf"

diff --git a/ucm2/Qualcomm/x1e80100/HiFi.conf b/ucm2/Qualcomm/x1e80100/HiFi.conf
index 1a4f73fc1109e7c7c5442df46fd1aabaf079a1c6..dcecacf32955d953b49fd015e88f74df23206826 100644 (file)
--- a/ucm2/Qualcomm/x1e80100/HiFi.conf
+++ b/ucm2/Qualcomm/x1e80100/HiFi.conf
@@ -9,7 +9,6 @@ SectionVerb {
                cset "name='MultiMedia4 Mixer VA_CODEC_DMA_TX_0' 1"
        ]
 
-       Include.wcde.File "/codecs/wcd938x/DefaultEnableSeq.conf"
        Include.wsae.File "/codecs/wsa884x/four-speakers/DefaultEnableSeq.conf"
        Include.wsm1e.File "/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerEnableSeq.conf"
        Include.wsm2e.File "/codecs/qcom-lpass/wsa-macro/Wsa2SpeakerEnableSeq.conf"

diff --git a/ucm2/Qualcomm/x1e80100/X1E80100-CRD.conf b/ucm2/Qualcomm/x1e80100/X1E80100-CRD.conf
index e4c62fb4fae73009c7e1c0660261136cb9c62a8b..c73314500a216790e30ccaaf69543bcb422569d1 100644 (file)
--- a/ucm2/Qualcomm/x1e80100/X1E80100-CRD.conf
+++ b/ucm2/Qualcomm/x1e80100/X1E80100-CRD.conf
@@ -5,6 +5,12 @@ SectionUseCase."HiFi" {
        Comment "HiFi quality Music."
 }
 
+BootSequence [
+       cset "name='HPHL Volume' 20"
+       cset "name='HPHR Volume' 20"
+       cset "name='ADC2 Volume' 10"
+]
+
 Include.card-init.File "/lib/card-init.conf"
 Include.ctl-remap.File "/lib/ctl-remap.conf"
 Include.wcd-init.File "/codecs/wcd938x/init.conf"

diff --git a/ucm2/codecs/wcd938x/DefaultEnableSeq.conf b/ucm2/codecs/wcd938x/DefaultEnableSeq.conf
deleted file mode 100644 (file)
index 5da6717..0000000
--- a/ucm2/codecs/wcd938x/DefaultEnableSeq.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-EnableSequence [
-       cset "name='HPHR Volume' 20"
-       cset "name='HPHL Volume' 20"
-]

diff --git a/ucm2/codecs/wcd938x/HeadphoneMicEnableSeq.conf b/ucm2/codecs/wcd938x/HeadphoneMicEnableSeq.conf
index 58b6b7987d57850d752d33e041cf14f04ae03a88..8ea2472b87f19b4d76fcd44a5198dfdca6a8b4ef 100644 (file)
--- a/ucm2/codecs/wcd938x/HeadphoneMicEnableSeq.conf
+++ b/ucm2/codecs/wcd938x/HeadphoneMicEnableSeq.conf
@@ -3,5 +3,4 @@ EnableSequence [
        cset "name='HDR12 MUX' NO_HDR12"
        cset "name='ADC2 MUX' INP2"
        cset "name='ADC2 Switch' 1"
-       cset "name='ADC2 Volume' 10"
 ]

diff --git a/ucm2/codecs/wcd938x/init.conf b/ucm2/codecs/wcd938x/init.conf
index c2a418c7930dd4781ac8c9f9e140d5636db6bb25..256452bdc1b2f3329892a05e00e5bed4abc3a2ed 100644 (file)
--- a/ucm2/codecs/wcd938x/init.conf
+++ b/ucm2/codecs/wcd938x/init.conf
@@ -1,9 +1,5 @@
 # WCD938X specific volume control settings
 
-BootSequence [
-       cset "name='ADC2 Volume' 12"
-]
-
 LibraryConfig.remap.Config {
 
        ctl.default.map {

diff --git a/ucm2/codecs/wsa883x/SpeakerEnableSeq.conf b/ucm2/codecs/wsa883x/SpeakerEnableSeq.conf
index 3a05b4f263af17cc5a77edfa261544d272649900..a079cdc93bfc2a8a4df411d5a8c3817ab03a1f77 100644 (file)
--- a/ucm2/codecs/wsa883x/SpeakerEnableSeq.conf
+++ b/ucm2/codecs/wsa883x/SpeakerEnableSeq.conf
@@ -4,11 +4,9 @@ EnableSequence [
        cset "name='SpkrLeft DAC Switch' 1"
        cset "name='SpkrLeft VISENSE Switch' 0"
        cset "name='SpkrLeft WSA MODE' 0"
-       cset "name='SpkrLeft PA Volume' 12"
        cset "name='SpkrRight COMP Switch' 1"
        cset "name='SpkrRight BOOST Switch' 1"
        cset "name='SpkrRight DAC Switch' 1"
        cset "name='SpkrRight VISENSE Switch' 0"
-       cset "name='SpkrRight PA Volume' 12"
        cset "name='SpkrRight WSA MODE' 0"
 ]