ucm2: HDA - remove HDA-Capture-value.conf and put contents directly to HDACaptureDevi...

Link: https://github.com/alsa-project/alsa-ucm-conf/pull/526
Fixes: 19fc5b9 ("ucm2: HDA: HiFi-analog/mic: Refactor the analog mic discovery")
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/HDA/HDA-Capture-value.conf b/ucm2/HDA/HDA-Capture-value.conf
deleted file mode 100644 (file)
index 2f1316a..0000000
--- a/ucm2/HDA/HDA-Capture-value.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CapturePCM "hw:${CardId}"
-CaptureMixerElem "Capture"
-CaptureVolume "Capture Volume"
-CaptureSwitch "Capture Switch"

diff --git a/ucm2/HDA/HiFi-mic.conf b/ucm2/HDA/HiFi-mic.conf
index ade9863de487d465b9c850491f6048b76305b9c6..9d43ce4db0b5469b58eb0b03df3be2e8202886d3 100644 (file)
--- a/ucm2/HDA/HiFi-mic.conf
+++ b/ucm2/HDA/HiFi-mic.conf
@@ -316,7 +316,10 @@ DefineMacro.HDACaptureDevice.SectionDevice."${var:__DevName}" {
 
        Value {
                CapturePriority "${var:__Priority}"
-               Include.value.File "/HDA/HDA-Capture-value.conf"
+               CapturePCM "hw:${CardId}"
+               CaptureMixerElem "Capture"
+               CaptureVolume "Capture Volume"
+               CaptureSwitch "Capture Switch"
                CaptureMasterElem "${var:__MicName} Boost"
        }
        If.jack {