From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 24 Mar 2025 16:27:48 +0000 (+0100)
Subject: sof-hda-dsp: Use common HDA initialization from /HDA/init.conf
X-Git-Tag: v1.2.14~16
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=db6932f2fcfb7e8f03df4273f70fca326e2bd908;p=alsa-ucm-conf.git

sof-hda-dsp: Use common HDA initialization from /HDA/init.conf

No functional changes.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf
index 571c207..892894b 100644
--- a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf
+++ b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf
@@ -44,38 +44,7 @@ SectionUseCase."HiFi" {
 	Comment "Play HiFi quality Music"
 }
 
-# the kcontrols initial values, which will be set by `alsactl init`
-
-If.amute {
-	Condition {
-		Type ControlExists
-		Control "name='Auto-Mute Mode'"
-	}
-	True.BootSequence [
-		cset "name='Auto-Mute Mode' off"
-	]
-}
-
-If.master {
-	Condition {
-		Type ControlExists
-		Control "name='Master Playback Volume'"
-	}
-	True.BootSequence [
-		cset "name='Master Playback Volume' 60%"
-		cset "name='Master Playback Switch' on"
-	]
-}
-
-If.speaker {
-	Condition {
-		Type ControlExists
-		Control "name='Speaker Playback Volume'"
-	}
-	True.BootSequence [
-		cset "name='Speaker Playback Volume' 60%"
-	]
-}
+Include.hda-init.File "/HDA/init.conf"
 
 If.DellMuteLed {
 	Condition {
@@ -86,16 +55,6 @@ If.DellMuteLed {
 	True.Macro [{ SetLED { LED="speaker" Action="detach" CtlId="Master Playback Switch" } }]
 }
 
-If.headphone {
-	Condition {
-		Type ControlExists
-		Control "name='Headphone Playback Volume'"
-	}
-	True.BootSequence [
-		cset "name='Headphone Playback Volume' 60%"
-	]
-}
-
 If.dmic {
 	Condition {
 		Type String
@@ -118,17 +77,6 @@ If.dmic {
 	}
 }
 
-If.Capture {
-	Condition {
-		Type ControlExists
-		Control "name='Capture Switch'"
-	}
-	True.BootSequence [
-		cset "name='Capture Volume' 60%"
-		cset "name='Capture Switch' on"
-	]
-}
-
 Include.hdmi-pcm.File "/common/pcm/hdmi.conf"
 
 Macro.0.HdmiDevice { Iec61937Devices "${var:Iec61937Pcms1}" Dev 3 Idx 0 }