From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 21 Mar 2025 17:44:01 +0000 (+0100)
Subject: ucm2: HDA - remove HDA-Capture-value.conf and put contents directly to HDACaptureDevi... 
X-Git-Tag: v1.2.14~37
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=aaa7455aaf36537cc7b198fabbc8cdef31ea7371;p=alsa-ucm-conf.git

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

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
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 ade9863..9d43ce4 100644
--- 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 {