Merge ~kobako/ubuntu/+source/alsa-ucm-conf:LP2015972_L into ubuntu/+source/alsa-ucm-conf:ubuntu/lunar-devel

[koba]

BugLink: https://bugs.launchpad.net/bugs/2015972

[Feature Description]
When users press the speaker mute hotkey and the speaker is muted,
the speaker mute LED indicator will light up.
When the speaker is not muted,
the speaker mute LED indicator will light out.

[Test Case]
1. run G16 with target kernel.
2. press the mute hotkey
3. check if speaker mute led can be switched.

[Where problems could occur]
Low, just register a speaker mute led control for dell-laptop.

[Sebastien Bacher (seb128)]

Thank you for your contribution, the change should not be inline though but in debian/patches and you should have a debian/changelog entry explaining the fix and referencing to the launchpad bug to close

review: Needs Fixing

[koba (kobako)]

@Seb128, thanks for reviewing and comment,
Have modified as per your comment,
1. add patch to debian/patches
2. add a entry in d/changelog

[Sebastien Bacher (seb128)]

Thanks, I've uploaded to the lunar queue now

review: Approve

Unmerged commits

600e042... by koba on 2023-03-06

1.2.6.3-1ubuntu9 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/changelog b/debian/changelog
index cef7216..95aa998 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+alsa-ucm-conf (1.2.6.3-1ubuntu9) lunar; urgency=medium
+
+  * d/p/0014-sof-hda-dsp-Add-speaker-led-support.patch
+     - Backport patch to fix speaker mute led (LP: #2015972)
+
+ -- Koba Ko <[e-mail]>  Wed, 19 Apr 2023 09:50:30 +0800
+
 alsa-ucm-conf (1.2.6.3-1ubuntu8) lunar; urgency=medium
 
   * d/p/0001-ucm2-HDA-Update-Mic-LED-settings-for-ACP-DMIC.patch
diff --git a/debian/patches/0014-sof-hda-dsp-Add-speaker-led-support.patch b/debian/patches/0014-sof-hda-dsp-Add-speaker-led-support.patch
new file mode 100644
index 0000000..293dd61
--- /dev/null
+++ b/debian/patches/0014-sof-hda-dsp-Add-speaker-led-support.patch
@@ -0,0 +1,41 @@
+From 6d4441b0398755c7f6e1b863d23d4f607243f3c2 Mon Sep 17 00:00:00 2001
+From: KobaKo <[e-mail]>
+Date: Mon, 6 Mar 2023 20:22:51 +0800
+Subject: [PATCH] sof-hda-dsp: Add speaker led support
+
+Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/302
+Signed-off-by: KobaKo <[e-mail]>
+Signed-off-by: Jaroslav Kysela <[e-mail]>
+(cherry picked from commit a2cabe3044075d53e4df0d4bb7c0818071e95e12)
+Signed-off-by: Koba Ko <[e-mail]>
+---
+ ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf
+index b47777b..35bd485 100644
+--- a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf
++++ b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf
+@@ -51,6 +51,19 @@ If.speaker {
+ 	]
+ }
+ 
++If.DellMuteLed {
++	Condition {
++		Type String
++		Haystack "$${sys:class/leds/platform::mute/device}"
++		Needle "dell-laptop"
++	}
++	True {
++		FixedBootSequence [
++			sysw "-/class/sound/ctl-led/speaker/card${CardNumber}/attach:Master Playback Switch"
++		]
++	}
++}
++
+ If.headphone {
+ 	Condition {
+ 		Type ControlExists
+-- 
+2.34.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 7b3df49..059fae2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ ucm2-sof-hda-dsp-If.devdmic-cleanup.patch
 sof-hda-dsp-Set-Dmic0-Capture-Switch-on.patch
 ucm2-sof-soundwire-Update-Mic-LED-settings.patch
 0001-ucm2-HDA-Update-Mic-LED-settings-for-ACP-DMIC.patch
+0014-sof-hda-dsp-Add-speaker-led-support.patch