Catcrafts/alsa-ucm-conf
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
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>
This commit is contained in:
Johan Hovold 2024-01-09 17:52:14 +01:00 • committed by Jaroslav Kysela
commit 8a7fb2c936
8 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ucm2/Qualcomm/sc8280xp/HiFi.conf
View file

@ -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 {

8
ucm2/Qualcomm/sc8280xp/LENOVO-X13s.conf
View file

@ -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"

1
ucm2/Qualcomm/x1e80100/HiFi.conf
View file

@ -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"

6
ucm2/Qualcomm/x1e80100/X1E80100-CRD.conf
View file

@ -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"

4
ucm2/codecs/wcd938x/DefaultEnableSeq.conf
View file

@ -1,4 +0,0 @@
EnableSequence [
cset "name='HPHR Volume' 20"
cset "name='HPHL Volume' 20"
]

1
ucm2/codecs/wcd938x/HeadphoneMicEnableSeq.conf
View file

@ -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"
]

4
ucm2/codecs/wcd938x/init.conf
View file

@ -1,9 +1,5 @@
# WCD938X specific volume control settings
BootSequence [
cset "name='ADC2 Volume' 12"
]
LibraryConfig.remap.Config {
ctl.default.map {

2
ucm2/codecs/wsa883x/SpeakerEnableSeq.conf
View file

@ -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"
]