ucm2: Qualcomm: x1e80100: fix hardware volume control

The lazy include of the four codec initialisation files are incorrectly
specified using the same identifier which means that only the last one
is actually included.

This specifically means that the sound server falls back to software
mixing as the Speaker and Headphones mixer elements are not defined.

The default Mic volume and Speaker digital volume are also never set by
the BootSequence as intended (even if the Mic volume is currently
overridden in the enable sequence).

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/x1e80100/X1E80100-CRD.conf b/ucm2/Qualcomm/x1e80100/X1E80100-CRD.conf
index 5604df3e77e9d2395404576af300b590fcd2cbc0..e4c62fb4fae73009c7e1c0660261136cb9c62a8b 100644 (file)
--- a/ucm2/Qualcomm/x1e80100/X1E80100-CRD.conf
+++ b/ucm2/Qualcomm/x1e80100/X1E80100-CRD.conf
@@ -7,7 +7,7 @@ SectionUseCase."HiFi" {
 
 Include.card-init.File "/lib/card-init.conf"
 Include.ctl-remap.File "/lib/ctl-remap.conf"
-Include.codec-init.File "/codecs/wcd938x/init.conf"
-Include.codec-init.File "/codecs/wsa884x/four-speakers/init.conf"
-Include.codec-init.File "/codecs/qcom-lpass/wsa-macro/four-speakers/init.conf"
-Include.codec-init.File "/codecs/qcom-lpass/rx-macro/init.conf"
+Include.wcd-init.File "/codecs/wcd938x/init.conf"
+Include.wsa-init.File "/codecs/wsa884x/four-speakers/init.conf"
+Include.wsam-init.File "/codecs/qcom-lpass/wsa-macro/four-speakers/init.conf"
+Include.rxm-init.File "/codecs/qcom-lpass/rx-macro/init.conf"