ucm2: Qualcomm: sc8280xp: fix internal microphones device

A recent change renamed the internal microphones device from "DMic01" to
"Mic", but the latter name is already used by the headset microphone so
this breaks the internal microphones on the Lenovo ThinkPad X13s.

Rename the headset microphone device so that the names are unique and
fix up the jack hw mute property which is still using the old name.

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/563
Fixes: ea7a065a7b50 ("ucm: fix SectionDevice identifiers")
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 e20aa9c051f91b2c55418c6ad345ca2aafd422d5..916f1ee413d88338dee25cf9af7164b4533c26df 100644 (file)
--- a/ucm2/Qualcomm/sc8280xp/HiFi.conf
+++ b/ucm2/Qualcomm/sc8280xp/HiFi.conf
@@ -50,8 +50,8 @@ SectionDevice."Headphones" {
        }
 }
 
-SectionDevice."Mic" {
-       Comment "Mic"
+SectionDevice."Headset" {
+       Comment "Headset microphone"
 
        Include.wcdmice.File "/codecs/wcd938x/HeadphoneMicEnableSeq.conf"
        Include.wcdmicd.File "/codecs/wcd938x/HeadphoneMicDisableSeq.conf"
@@ -63,12 +63,12 @@ SectionDevice."Mic" {
                CapturePCM "hw:${CardId},2"
                CaptureMixerElem "ADC2"
                JackControl "Mic Jack"
-               JackHWMute "DMic01"
+               JackHWMute "Mic"
        }
 }
 
 SectionDevice."Mic" {
-       Comment "Microphone"
+       Comment "Internal microphones"
 
        Include.vadm0e.File "/codecs/qcom-lpass/va-macro/DMIC0EnableSeq.conf"
        Include.vadm0d.File "/codecs/qcom-lpass/va-macro/DMIC0DisableSeq.conf"