ucm2: Qualcomm: sm8650-qrd: fix codec initialisation

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 Speakers and Headphone stereo mixer
elements are never defined and cannot be used for hardware volume
control.

The default Speaker digital volume is also never set by the BootSequence
as intended.

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

diff --git a/ucm2/Qualcomm/sm8650/QRD/SM8650-QRD.conf b/ucm2/Qualcomm/sm8650/QRD/SM8650-QRD.conf
index a1991d56b74d755d4e21fc8ec3293a1497678829..69e1870861edc8044d6014442312649929b890bc 100644 (file)
--- a/ucm2/Qualcomm/sm8650/QRD/SM8650-QRD.conf
+++ b/ucm2/Qualcomm/sm8650/QRD/SM8650-QRD.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/wsa884x/two-speakers/init.conf"
-Include.codec-init.File "/codecs/wcd939x/init.conf"
-Include.codec-init.File "/codecs/qcom-lpass/wsa-macro/init.conf"
-Include.codec-init.File "/codecs/qcom-lpass/rx-macro/init.conf"
+Include.wsa-init.File "/codecs/wsa884x/two-speakers/init.conf"
+Include.wcd-init.File "/codecs/wcd939x/init.conf"
+Include.wsam-init.File "/codecs/qcom-lpass/wsa-macro/init.conf"
+Include.rxm-init.File "/codecs/qcom-lpass/rx-macro/init.conf"