Merge ~mschiu77/ubuntu/+source/alsa-ucm-conf:ubuntu/oracular-devel into ubuntu/+source/alsa-ucm-conf:ubuntu/oracular-devel

[Chris Chiu]

Added patch to fix missing digital speaker on Dell Tarako (LP: #2088403)

[Anthony Wong (anthonywong)]

For the record, this MR has already been merged to Oracular and package already released.

[Simon Quigley (tsimonq2)]

review: Approve (noop)

Unmerged commits

7972e84... by Chris Chiu on 2024-11-18

1.2.10-1ubuntu6.2 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/changelog b/debian/changelog
index 88f154a..dec9622 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+alsa-ucm-conf (1.2.10-1ubuntu6.2) oracular; urgency=medium
+
+  * Added patch to fix missing digital speaker on Dell Tarako (LP: #2088403)
+    - d/p/0001-sof-soundwire-Add-basic-support-for-cs42l43-s-speake.patch
+
+ -- Chris Chiu <[e-mail]>  Mon, 18 Nov 2024 13:19:51 +0800
+
 alsa-ucm-conf (1.2.10-1ubuntu6.1) oracular; urgency=medium
 
   * Added patches for CS42L43+CS35L56 soundwire support (LP: #2069760)
diff --git a/debian/patches/0001-sof-soundwire-Add-basic-support-for-cs42l43-s-speake.patch b/debian/patches/0001-sof-soundwire-Add-basic-support-for-cs42l43-s-speake.patch
new file mode 100644
index 0000000..bbbbe4c
--- /dev/null
+++ b/debian/patches/0001-sof-soundwire-Add-basic-support-for-cs42l43-s-speake.patch
@@ -0,0 +1,46 @@
+From: Charles Keepax <[e-mail]>
+Date: Tue, 23 Apr 2024 16:43:05 +0100
+Subject: [PATCH] sof-soundwire: Add basic support for cs42l43's speaker
+
+Previous support was added for the mics and headset on cs42l43, expand
+this support with additional configuration for the speaker output.
+
+Link: https://lore.kernel.org/alsa-devel/[e-mail]/
+Signed-off-by: Charles Keepax <[e-mail]>
+Signed-off-by: Jaroslav Kysela <[e-mail]>
+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commit/035d9206cffdf7942352d2daf3c34dde491c01dc.patch
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2088403
+Signed-off-by: Chris Chiu <[e-mail]>
+---
+ ucm2/sof-soundwire/cs42l43-spk.conf | 25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)
+ create mode 100644 ucm2/sof-soundwire/cs42l43-spk.conf
+
+--- /dev/null
++++ b/ucm2/sof-soundwire/cs42l43-spk.conf
+@@ -0,0 +1,25 @@
++# Use case Configuration for sof-soundwire card
++
++SectionDevice."Speaker" {
++	Comment "Speaker"
++
++	ConflictingDevice [
++		"Headphones"
++	]
++
++	EnableSequence [
++		cset "name='cs42l43 Speaker L Input 1' 'DP5RX1'"
++		cset "name='cs42l43 Speaker R Input 1' 'DP5RX2'"
++	]
++
++	DisableSequence [
++		cset "name='cs42l43 Speaker L Input 1' 'None'"
++		cset "name='cs42l43 Speaker R Input 1' 'None'"
++	]
++
++	Value {
++		PlaybackPriority 100
++		PlaybackPCM "hw:${CardId},0"
++		PlaybackMixerElem "cs42l43 Speaker Digital"
++	}
++}
diff --git a/debian/patches/series b/debian/patches/series
index 61080b9..0c93914 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,3 +19,4 @@
 0001-sof-soundwire-Change-map-control-names-to-make-them-.patch
 0002-sof-soundwire-Add-sequence-for-controlling-Mic-Mute-.patch
 0001-acppdmmach-add-support-for-ACP-7.0.patch
+0001-sof-soundwire-Add-basic-support-for-cs42l43-s-speake.patch