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

Proposed by Chris Chiu
Status: Superseded
Proposed branch: ~mschiu77/ubuntu/+source/alsa-ucm-conf:ubuntu/oracular-devel
Merge into: ubuntu/+source/alsa-ucm-conf:ubuntu/oracular
Diff against target: 594 lines (+518/-0)
12 files modified
debian/changelog (+23/-0)
debian/patches/0001-acppdmmach-add-support-for-ACP-7.0.patch (+37/-0)
debian/patches/0001-sof-soundwire-Add-basic-support-for-cs42l43-s-speake.patch (+46/-0)
debian/patches/0001-sof-soundwire-Add-missing-match-for-cs42l43-speakers.patch (+28/-0)
debian/patches/0001-sof-soundwire-Change-map-control-names-to-make-them-.patch (+93/-0)
debian/patches/0001-sof-soundwire-fix-rt1318-config-typo-in-rt1318spk-ma.patch (+23/-0)
debian/patches/0002-sof-soundwire-Add-sequence-for-controlling-Mic-Mute-.patch (+53/-0)
debian/patches/0002-sof-soundwire-Add-support-for-cs42l43-cs35l56-bridge.patch (+95/-0)
debian/patches/0002-sof-soundwire-fix-rt1318-config-copy-n-paste-error-i.patch (+30/-0)
debian/patches/0003-sof-soundwire-rt1308-Fix-single-amp-configuration.patch (+36/-0)
debian/patches/0004-sof-soundwire-rt1316-rt1318-fix-channel-selection-fo.patch (+44/-0)
debian/patches/series (+10/-0)
Reviewer Review Type Date Requested Status
git-ubuntu import Pending
Review via email: mp+476659@code.launchpad.net

This proposal has been superseded by a proposal from 2024-11-18.

Commit message

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

To post a comment you must log in.

Unmerged commits

7972e84... by Chris Chiu

1.2.10-1ubuntu6.2 (patches unapplied)

Imported using git-ubuntu import.

d1bdcfc... by Chris Chiu

1.2.10-1ubuntu6.1 (patches unapplied)

Imported using git-ubuntu import.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 3dd07c0..dec9622 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,26 @@
6+alsa-ucm-conf (1.2.10-1ubuntu6.2) oracular; urgency=medium
7+
8+ * Added patch to fix missing digital speaker on Dell Tarako (LP: #2088403)
9+ - d/p/0001-sof-soundwire-Add-basic-support-for-cs42l43-s-speake.patch
10+
11+ -- Chris Chiu <chris.chiu@canonical.com> Mon, 18 Nov 2024 13:19:51 +0800
12+
13+alsa-ucm-conf (1.2.10-1ubuntu6.1) oracular; urgency=medium
14+
15+ * Added patches for CS42L43+CS35L56 soundwire support (LP: #2069760)
16+ - d/p/0001-sof-soundwire-fix-rt1318-config-typo-in-rt1318spk-ma.patch
17+ - d/p/0002-sof-soundwire-fix-rt1318-config-copy-n-paste-error-i.patch
18+ - d/p/0003-sof-soundwire-rt1308-Fix-single-amp-configuration.patch
19+ - d/p/0004-sof-soundwire-rt1316-rt1318-fix-channel-selection-fo.patch
20+ - d/p/0001-sof-soundwire-Add-missing-match-for-cs42l43-speakers.patch
21+ - d/p/0002-sof-soundwire-Add-support-for-cs42l43-cs35l56-bridge.patch
22+ - d/p/0001-sof-soundwire-Change-map-control-names-to-make-them-.patch
23+ - d/p/0002-sof-soundwire-Add-sequence-for-controlling-Mic-Mute-.patch
24+ * Added patches for AMD micmute LED (LP: #2085067)
25+ - d/p/0001-acppdmmach-add-support-for-ACP-7.0.patch
26+
27+ -- Chris Chiu <chris.chiu@canonical.com> Wed, 05 Nov 2024 17:58:25 +0800
28+
29 alsa-ucm-conf (1.2.10-1ubuntu6) oracular; urgency=medium
30
31 * Added changes:
32diff --git a/debian/patches/0001-acppdmmach-add-support-for-ACP-7.0.patch b/debian/patches/0001-acppdmmach-add-support-for-ACP-7.0.patch
33new file mode 100644
34index 0000000..049497f
35--- /dev/null
36+++ b/debian/patches/0001-acppdmmach-add-support-for-ACP-7.0.patch
37@@ -0,0 +1,37 @@
38+From b2358f24a93d5a07b5bf7c35f0d76676dc85869c Mon Sep 17 00:00:00 2001
39+From: Mario Limonciello <mario.limonciello@amd.com>
40+Date: Thu, 17 Oct 2024 11:44:20 -0500
41+Subject: [PATCH] acppdmmach: add support for ACP 7.0
42+
43+Starting with ACP 7.0 there is a generic 'acppdmmach' driver that
44+will be utilized.
45+
46+Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/452
47+Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
48+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
49+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commit/b2358f24a93d5a07b5bf7c35f0d76676dc85869c
50+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2085067
51+Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
52+---
53+ ucm2/HDA/HDA.conf | 2 +-
54+ ucm2/conf.d/acp-pdm-mach/acp-pdm-mach.conf | 1 +
55+ 2 files changed, 2 insertions(+), 1 deletion(-)
56+ create mode 120000 ucm2/conf.d/acp-pdm-mach/acp-pdm-mach.conf
57+
58+--- a/ucm2/HDA/HDA.conf
59++++ b/ucm2/HDA/HDA.conf
60+@@ -3,7 +3,7 @@
61+ Define.Use "" # a non-empty string to use UCM configuration for HDA devices
62+ Define.Done "" # a non-empty string to skip the end error
63+
64+-Define.AcpCardId "$${find-card:field=name,return=id,regex='^acp(|6[23x])$'}"
65++Define.AcpCardId "$${find-card:field=name,return=id,regex='^acp(|6[23x]|-pdm-mach)$'}"
66+ Define.DeviceMic "Mic"
67+
68+ If.dualcodec {
69+--- /dev/null
70++++ b/ucm2/conf.d/acp-pdm-mach/acp-pdm-mach.conf
71+@@ -0,0 +1,3 @@
72++Syntax 3
73++
74++Include.linked.File "/common/linked.conf"
75diff --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
76new file mode 100644
77index 0000000..bbbbe4c
78--- /dev/null
79+++ b/debian/patches/0001-sof-soundwire-Add-basic-support-for-cs42l43-s-speake.patch
80@@ -0,0 +1,46 @@
81+From: Charles Keepax <ckeepax@opensource.cirrus.com>
82+Date: Tue, 23 Apr 2024 16:43:05 +0100
83+Subject: [PATCH] sof-soundwire: Add basic support for cs42l43's speaker
84+
85+Previous support was added for the mics and headset on cs42l43, expand
86+this support with additional configuration for the speaker output.
87+
88+Link: https://lore.kernel.org/alsa-devel/20240423154305.2782347-1-ckeepax@opensource.cirrus.com/
89+Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
90+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
91+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commit/035d9206cffdf7942352d2daf3c34dde491c01dc.patch
92+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2088403
93+Signed-off-by: Chris Chiu <chris.chiu@canonical.com>
94+---
95+ ucm2/sof-soundwire/cs42l43-spk.conf | 25 +++++++++++++++++++++++++
96+ 1 file changed, 25 insertions(+)
97+ create mode 100644 ucm2/sof-soundwire/cs42l43-spk.conf
98+
99+--- /dev/null
100++++ b/ucm2/sof-soundwire/cs42l43-spk.conf
101+@@ -0,0 +1,25 @@
102++# Use case Configuration for sof-soundwire card
103++
104++SectionDevice."Speaker" {
105++ Comment "Speaker"
106++
107++ ConflictingDevice [
108++ "Headphones"
109++ ]
110++
111++ EnableSequence [
112++ cset "name='cs42l43 Speaker L Input 1' 'DP5RX1'"
113++ cset "name='cs42l43 Speaker R Input 1' 'DP5RX2'"
114++ ]
115++
116++ DisableSequence [
117++ cset "name='cs42l43 Speaker L Input 1' 'None'"
118++ cset "name='cs42l43 Speaker R Input 1' 'None'"
119++ ]
120++
121++ Value {
122++ PlaybackPriority 100
123++ PlaybackPCM "hw:${CardId},0"
124++ PlaybackMixerElem "cs42l43 Speaker Digital"
125++ }
126++}
127diff --git a/debian/patches/0001-sof-soundwire-Add-missing-match-for-cs42l43-speakers.patch b/debian/patches/0001-sof-soundwire-Add-missing-match-for-cs42l43-speakers.patch
128new file mode 100644
129index 0000000..ebfe89a
130--- /dev/null
131+++ b/debian/patches/0001-sof-soundwire-Add-missing-match-for-cs42l43-speakers.patch
132@@ -0,0 +1,28 @@
133+From: Charles Keepax <ckeepax@opensource.cirrus.com>
134+Date: Mon, 8 Jul 2024 12:59:18 +0100
135+Subject: sof-soundwire: Add missing match for cs42l43 speakers
136+
137+The cs42l43 reports as cs42l43-spk in the speaker case, the regex in
138+sof-soundwire needs updated to recognise that.
139+
140+Fixes: 035d9206cffd ("sof-soundwire: Add basic support for cs42l43's speaker")
141+Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
142+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
143+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commits/d8aea84bebaae416c530a2d448f5e3758809c09f
144+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2069760
145+Signed-off-by: Chris Chiu <chris.chiu@canonical.com>
146+---
147+ ucm2/sof-soundwire/sof-soundwire.conf | 2 +-
148+ 1 file changed, 1 insertion(+), 1 deletion(-)
149+
150+--- a/ucm2/sof-soundwire/sof-soundwire.conf
151++++ b/ucm2/sof-soundwire/sof-soundwire.conf
152+@@ -19,7 +19,7 @@
153+
154+ DefineRegex {
155+ SpeakerCodec {
156+- Regex " spk:([a-z0-9]+(-sdca)?)"
157++ Regex " spk:([a-z0-9]+((-sdca)|(-spk))?)"
158+ String "${CardComponents}"
159+ }
160+ SpeakerChannels {
161diff --git a/debian/patches/0001-sof-soundwire-Change-map-control-names-to-make-them-.patch b/debian/patches/0001-sof-soundwire-Change-map-control-names-to-make-them-.patch
162new file mode 100644
163index 0000000..7b89176
164--- /dev/null
165+++ b/debian/patches/0001-sof-soundwire-Change-map-control-names-to-make-them-.patch
166@@ -0,0 +1,93 @@
167+From: Maciej Strozek <mstrozek@opensource.cirrus.com>
168+Date: Thu, 17 Oct 2024 13:20:26 +0100
169+Subject: sof-soundwire: Change map control names to make them unique and user
170+ friendly
171+
172+Both 'Speaker Digital' and 'cs42l43 PDM2' names were found in other alsa
173+controls, confusing the MixerElems paths. Make them unique to avoid errors for
174+hardware mutes. Also add 'Capture' string into microphone controls to make
175+them work properly.
176+
177+Link: https://lore.kernel.org/alsa-devel/20241017122027.1207373-1-mstrozek@opensource.cirrus.com/
178+Signed-off-by: Maciej Strozek <mstrozek@opensource.cirrus.com>
179+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
180+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commits/9864d624b27e3779d958138561e48f59287a124a
181+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2069760
182+Signed-off-by: Chris Chiu <chris.chiu@canonical.com>
183+---
184+ ucm2/codecs/cs42l43/init.conf | 10 ++++++++--
185+ ucm2/sof-soundwire/cs35l56-bridge.conf | 6 +++---
186+ ucm2/sof-soundwire/cs42l43-dmic.conf | 2 +-
187+ ucm2/sof-soundwire/cs42l43.conf | 3 ++-
188+ 4 files changed, 14 insertions(+), 7 deletions(-)
189+
190+--- a/ucm2/codecs/cs42l43/init.conf
191++++ b/ucm2/codecs/cs42l43/init.conf
192+@@ -2,13 +2,19 @@
193+
194+ LibraryConfig.remap.Config {
195+ ctl.default.map {
196+- "name='cs42l43 PDM2 Switch'" {
197++ "name='cs42l43 Microphone Capture Switch'" {
198+ "name='cs42l43 Decimator 3 Switch'".vindex.0 0
199+ "name='cs42l43 Decimator 4 Switch'".vindex.1 0
200+ }
201+- "name='cs42l43 PDM2 Volume'" {
202++ "name='cs42l43 Microphone Capture Volume'" {
203+ "name='cs42l43 Decimator 3 Volume'".vindex.0 0
204+ "name='cs42l43 Decimator 4 Volume'".vindex.1 0
205+ }
206++ "name='cs42l43 Headset Microphone Capture Switch'" {
207++ "name='cs42l43 Decimator 1 Switch'".vindex.0 0
208++ }
209++ "name='cs42l43 Headset Microphone Capture Volume'" {
210++ "name='cs42l43 Decimator 1 Volume'".vindex.0 0
211++ }
212+ }
213+ }
214+--- a/ucm2/sof-soundwire/cs35l56-bridge.conf
215++++ b/ucm2/sof-soundwire/cs35l56-bridge.conf
216+@@ -2,11 +2,11 @@
217+
218+ LibraryConfig.remap.Config {
219+ ctl.default.map {
220+- "name='Speaker Digital Switch'" {
221++ "name='Speaker Playback Switch'" {
222+ "name='AMPL Speaker Switch'".vindex.0 0
223+ "name='AMPR Speaker Switch'".vindex.1 0
224+ }
225+- "name='Speaker Digital Volume'" {
226++ "name='Speaker Playback Volume'" {
227+ "name='AMPL Speaker Volume'".vindex.0 0
228+ "name='AMPR Speaker Volume'".vindex.1 0
229+ }
230+@@ -56,6 +56,6 @@
231+ PlaybackPriority 100
232+ PlaybackPCM "hw:${CardId},0"
233+ PlaybackMixer "default:${CardId}"
234+- PlaybackMixerElem "Speaker Digital"
235++ PlaybackMixerElem "Speaker"
236+ }
237+ }
238+--- a/ucm2/sof-soundwire/cs42l43-dmic.conf
239++++ b/ucm2/sof-soundwire/cs42l43-dmic.conf
240+@@ -21,6 +21,6 @@
241+ CapturePriority 100
242+ CapturePCM "hw:${CardId},4"
243+ CaptureMixer "default:${CardId}"
244+- CaptureMixerElem "cs42l43 PDM2"
245++ CaptureMixerElem "cs42l43 Microphone"
246+ }
247+ }
248+--- a/ucm2/sof-soundwire/cs42l43.conf
249++++ b/ucm2/sof-soundwire/cs42l43.conf
250+@@ -40,7 +40,8 @@
251+ Value {
252+ CapturePriority 200
253+ CapturePCM "hw:${CardId},4"
254+- CaptureMixerElem "cs42l43 Decimator 1"
255++ CaptureMixer "default:${CardId}"
256++ CaptureMixerElem "cs42l43 Headset Microphone"
257+ JackControl "Headset Mic Jack"
258+ }
259+ }
260diff --git a/debian/patches/0001-sof-soundwire-fix-rt1318-config-typo-in-rt1318spk-ma.patch b/debian/patches/0001-sof-soundwire-fix-rt1318-config-typo-in-rt1318spk-ma.patch
261new file mode 100644
262index 0000000..1c60872
263--- /dev/null
264+++ b/debian/patches/0001-sof-soundwire-fix-rt1318-config-typo-in-rt1318spk-ma.patch
265@@ -0,0 +1,23 @@
266+From: Jaroslav Kysela <perex@perex.cz>
267+Date: Mon, 11 Mar 2024 11:06:15 +0100
268+Subject: sof-soundwire: fix rt1318 config typo in rt1318spk macro
269+
270+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
271+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commit/7e22b7c214d346bd156131f3e6c6a5900bbf116d
272+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2069760
273+Signed-off-by: Chris Chiu <chris.chiu@canonical.com>
274+---
275+ ucm2/sof-soundwire/rt1318.conf | 2 +-
276+ 1 file changed, 1 insertion(+), 1 deletion(-)
277+
278+--- a/ucm2/sof-soundwire/rt1318.conf
279++++ b/ucm2/sof-soundwire/rt1318.conf
280+@@ -9,7 +9,7 @@
281+ DefineMacro.rt1318spk.If.0 {
282+ Condition {
283+ Type RegexMatch
284+- Regex "${var:__RegEx}"
285++ Regex "${var:__ForAmps}"
286+ String "${var:SpeakerAmps}"
287+ }
288+ True {
289diff --git a/debian/patches/0002-sof-soundwire-Add-sequence-for-controlling-Mic-Mute-.patch b/debian/patches/0002-sof-soundwire-Add-sequence-for-controlling-Mic-Mute-.patch
290new file mode 100644
291index 0000000..7a51a10
292--- /dev/null
293+++ b/debian/patches/0002-sof-soundwire-Add-sequence-for-controlling-Mic-Mute-.patch
294@@ -0,0 +1,53 @@
295+From: Maciej Strozek <mstrozek@opensource.cirrus.com>
296+Date: Thu, 17 Oct 2024 13:20:27 +0100
297+Subject: sof-soundwire: Add sequence for controlling Mic Mute LED
298+
299+Also ensure the unused microphone is disabled so that currently used mic
300+can fully control the LED.
301+
302+Link: https://lore.kernel.org/alsa-devel/20241017122027.1207373-2-mstrozek@opensource.cirrus.com/
303+Signed-off-by: Maciej Strozek <mstrozek@opensource.cirrus.com>
304+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
305+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commits/e4277a204cd61f8f68f616df0d8c42e5bdeb1475
306+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2069760
307+Signed-off-by: Chris Chiu <chris.chiu@canonical.com>
308+---
309+ ucm2/codecs/cs42l43/init.conf | 7 +++++++
310+ ucm2/sof-soundwire/cs42l43-dmic.conf | 2 ++
311+ ucm2/sof-soundwire/cs42l43.conf | 1 +
312+ 3 files changed, 10 insertions(+)
313+
314+--- a/ucm2/codecs/cs42l43/init.conf
315++++ b/ucm2/codecs/cs42l43/init.conf
316+@@ -18,3 +18,10 @@
317+ }
318+ }
319+ }
320++
321++FixedBootSequence [
322++ exec "-/sbin/modprobe snd_ctl_led"
323++ sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:cs42l43 Decimator 1 Switch"
324++ sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:cs42l43 Decimator 3 Switch"
325++ sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:cs42l43 Decimator 4 Switch"
326++]
327+--- a/ucm2/sof-soundwire/cs42l43-dmic.conf
328++++ b/ucm2/sof-soundwire/cs42l43-dmic.conf
329+@@ -13,6 +13,8 @@
330+ ]
331+
332+ DisableSequence [
333++ cset "name='cs42l43 Decimator 3 Switch' 0"
334++ cset "name='cs42l43 Decimator 4 Switch' 0"
335+ cset "name='cs42l43 DP1TX1 Input' 'None'"
336+ cset "name='cs42l43 DP1TX2 Input' 'None'"
337+ ]
338+--- a/ucm2/sof-soundwire/cs42l43.conf
339++++ b/ucm2/sof-soundwire/cs42l43.conf
340+@@ -33,6 +33,7 @@
341+ ]
342+
343+ DisableSequence [
344++ cset "name='cs42l43 Decimator 1 Switch' 0"
345+ cset "name='cs42l43 DP1TX1 Input' 'None'"
346+ cset "name='cs42l43 DP1TX2 Input' 'None'"
347+ ]
348diff --git a/debian/patches/0002-sof-soundwire-Add-support-for-cs42l43-cs35l56-bridge.patch b/debian/patches/0002-sof-soundwire-Add-support-for-cs42l43-cs35l56-bridge.patch
349new file mode 100644
350index 0000000..50076b0
351--- /dev/null
352+++ b/debian/patches/0002-sof-soundwire-Add-support-for-cs42l43-cs35l56-bridge.patch
353@@ -0,0 +1,95 @@
354+From: Charles Keepax <ckeepax@opensource.cirrus.com>
355+Date: Mon, 8 Jul 2024 12:59:19 +0100
356+Subject: sof-soundwire: Add support for cs42l43/cs35l56 bridge configuration
357+
358+The cs42l43 has both a SPI master and an I2S interface, in some
359+configurations 2 cs35l56 amplifiers are connected to these to provide
360+bass speakers whilst the cs42l43's internal speaker drivers are used for
361+the tweeters. Add UCM configuration for this type of system.
362+
363+Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
364+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
365+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commits/e4277a204cd61f8f68f616df0d8c42e5bdeb1475
366+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2069760
367+Signed-off-by: Chris Chiu <chris.chiu@canonical.com>
368+---
369+ ucm2/sof-soundwire/cs35l56-bridge.conf | 61 ++++++++++++++++++++++++++++++++++
370+ ucm2/sof-soundwire/sof-soundwire.conf | 2 +-
371+ 2 files changed, 62 insertions(+), 1 deletion(-)
372+ create mode 100644 ucm2/sof-soundwire/cs35l56-bridge.conf
373+
374+--- /dev/null
375++++ b/ucm2/sof-soundwire/cs35l56-bridge.conf
376+@@ -0,0 +1,61 @@
377++# Use case Configuration for sof-soundwire card
378++
379++LibraryConfig.remap.Config {
380++ ctl.default.map {
381++ "name='Speaker Digital Switch'" {
382++ "name='AMPL Speaker Switch'".vindex.0 0
383++ "name='AMPR Speaker Switch'".vindex.1 0
384++ }
385++ "name='Speaker Digital Volume'" {
386++ "name='AMPL Speaker Volume'".vindex.0 0
387++ "name='AMPR Speaker Volume'".vindex.1 0
388++ }
389++ }
390++}
391++
392++SectionDevice."Speaker" {
393++ Comment "Speaker"
394++
395++ ConflictingDevice [
396++ "Headphones"
397++ ]
398++
399++ EnableSequence [
400++ cset "name='cs42l43 Speaker L Input 1' 'ASPRX1'"
401++ cset "name='cs42l43 Speaker R Input 1' 'ASPRX2'"
402++ cset "name='cs42l43 ASPTX1 Input' 'DP5RX1'"
403++ cset "name='cs42l43 ASPTX2 Input' 'DP5RX2'"
404++
405++ cset "name='AMPL ASP1 TX1 Source' 'DSP1TX1'"
406++ cset "name='AMPL ASP1 TX2 Source' 'None'"
407++ cset "name='AMPL ASP1 TX3 Source' 'None'"
408++ cset "name='AMPL ASP1 TX4 Source' 'None'"
409++
410++ cset "name='AMPR ASP1 TX1 Source' 'None'"
411++ cset "name='AMPR ASP1 TX2 Source' 'DSP1TX1'"
412++ cset "name='AMPR ASP1 TX3 Source' 'None'"
413++ cset "name='AMPR ASP1 TX4 Source' 'None'"
414++
415++ cset "name='cs42l43 Speaker Digital Switch' 1"
416++ cset "name='cs42l43 Speaker Digital Volume' 128"
417++ ]
418++
419++ DisableSequence [
420++ cset "name='cs42l43 Speaker Digital Switch' 0"
421++
422++ cset "name='AMPL ASP1 TX2 Source' 'None'"
423++ cset "name='AMPR ASP1 TX1 Source' 'None'"
424++
425++ cset "name='cs42l43 ASPTX1 Input' 'None'"
426++ cset "name='cs42l43 ASPTX2 Input' 'None'"
427++ cset "name='cs42l43 Speaker L Input 1' 'None'"
428++ cset "name='cs42l43 Speaker R Input 1' 'None'"
429++ ]
430++
431++ Value {
432++ PlaybackPriority 100
433++ PlaybackPCM "hw:${CardId},0"
434++ PlaybackMixer "default:${CardId}"
435++ PlaybackMixerElem "Speaker Digital"
436++ }
437++}
438+--- a/ucm2/sof-soundwire/sof-soundwire.conf
439++++ b/ucm2/sof-soundwire/sof-soundwire.conf
440+@@ -19,7 +19,7 @@
441+
442+ DefineRegex {
443+ SpeakerCodec {
444+- Regex " spk:([a-z0-9]+((-sdca)|(-spk))?)"
445++ Regex " spk:([a-z0-9]+((-sdca)|(-spk)|(-bridge))?)"
446+ String "${CardComponents}"
447+ }
448+ SpeakerChannels {
449diff --git a/debian/patches/0002-sof-soundwire-fix-rt1318-config-copy-n-paste-error-i.patch b/debian/patches/0002-sof-soundwire-fix-rt1318-config-copy-n-paste-error-i.patch
450new file mode 100644
451index 0000000..36f50d0
452--- /dev/null
453+++ b/debian/patches/0002-sof-soundwire-fix-rt1318-config-copy-n-paste-error-i.patch
454@@ -0,0 +1,30 @@
455+From: Jaroslav Kysela <perex@perex.cz>
456+Date: Mon, 11 Mar 2024 12:06:44 +0100
457+Subject: sof-soundwire: fix rt1318 config copy-n-paste error in rt1318spk
458+ macro
459+
460+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
461+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commits/4e0fcc79b7d517a957e12f02ecae5f3c69fa94dc
462+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2069760
463+Signed-off-by: Chris Chiu <chris.chiu@canonical.com>
464+---
465+ ucm2/sof-soundwire/rt1318.conf | 6 +++---
466+ 1 file changed, 3 insertions(+), 3 deletions(-)
467+
468+--- a/ucm2/sof-soundwire/rt1318.conf
469++++ b/ucm2/sof-soundwire/rt1318.conf
470+@@ -14,11 +14,11 @@
471+ }
472+ True {
473+ EnableSequence [
474+- cset "name='rt1308-${var:__Amp} RX Channel Select' ${var:__Sel}"
475+- cset "name='rt1308-${var:__Amp} DAC Switch' 1"
476++ cset "name='rt1318-${var:__Amp} RX Channel Select' ${var:__Sel}"
477++ cset "name='rt1318-${var:__Amp} DAC Switch' 1"
478+ ]
479+ DisableSequence [
480+- cset "name='rt1308-${var:__Amp} DAC Switch' 0"
481++ cset "name='rt1318-${var:__Amp} DAC Switch' 0"
482+ ]
483+ }
484+ }
485diff --git a/debian/patches/0003-sof-soundwire-rt1308-Fix-single-amp-configuration.patch b/debian/patches/0003-sof-soundwire-rt1308-Fix-single-amp-configuration.patch
486new file mode 100644
487index 0000000..54840df
488--- /dev/null
489+++ b/debian/patches/0003-sof-soundwire-rt1308-Fix-single-amp-configuration.patch
490@@ -0,0 +1,36 @@
491+From: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
492+Date: Mon, 11 Mar 2024 11:02:00 +0200
493+Subject: sof-soundwire: rt1308: Fix single amp configuration
494+
495+If the device have single rt1308 amp then the codec's Channel Select should
496+be set to "LR" and not to "LL". "LL" is only valid if we have 2 amps, in
497+that case one is the Left and the other is the Right channel.
498+
499+This fixes for example Dell Latitude 9520 which only played on the Left
500+speaker, Right is silent.
501+
502+Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/402
503+Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
504+Suggested-by: Jaroslav Kysela <perex@perex.cz>
505+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
506+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commits/9e29f9e27f4e27dce40d8d6803031bb4f7be3c48
507+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2069760
508+Signed-off-by: Chris Chiu <chris.chiu@canonical.com>
509+---
510+ ucm2/sof-soundwire/rt1308.conf | 5 +++--
511+ 1 file changed, 3 insertions(+), 2 deletions(-)
512+
513+--- a/ucm2/sof-soundwire/rt1308.conf
514++++ b/ucm2/sof-soundwire/rt1308.conf
515+@@ -28,8 +28,9 @@
516+ SectionDevice."Speaker" {
517+ Comment "Speaker"
518+
519+- Macro.num1.rt1308spk { ForAmps "[12]" Amp 1 Sel LL }
520+- Macro.num2.rt1308spk { ForAmps "2" Amp 2 Sel RR }
521++ Macro.num1.rt1308spk { ForAmps "1" Amp 1 Sel LR }
522++ Macro.num2.rt1308spk { ForAmps "2" Amp 1 Sel LL }
523++ Macro.num3.rt1308spk { ForAmps "2" Amp 2 Sel RR }
524+
525+ EnableSequence [
526+ cset "name='Speaker Switch' on"
527diff --git a/debian/patches/0004-sof-soundwire-rt1316-rt1318-fix-channel-selection-fo.patch b/debian/patches/0004-sof-soundwire-rt1316-rt1318-fix-channel-selection-fo.patch
528new file mode 100644
529index 0000000..1a1344b
530--- /dev/null
531+++ b/debian/patches/0004-sof-soundwire-rt1316-rt1318-fix-channel-selection-fo.patch
532@@ -0,0 +1,44 @@
533+From: Jaroslav Kysela <perex@perex.cz>
534+Date: Mon, 11 Mar 2024 13:09:08 +0100
535+Subject: sof-soundwire: rt1316/rt1318 - fix channel selection for one amp
536+
537+Like in commit 9e29f9e27f4e27dce40d8d6803031bb4f7be3c48, use L-R
538+channel selection when single amp is present.
539+
540+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
541+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commits/73981e94bb69da1be5b1e4a69ff99df28bcfb320
542+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2069760
543+Signed-off-by: Chris Chiu <chris.chiu@canonical.com>
544+---
545+ ucm2/sof-soundwire/rt1316.conf | 5 +++--
546+ ucm2/sof-soundwire/rt1318.conf | 5 +++--
547+ 2 files changed, 6 insertions(+), 4 deletions(-)
548+
549+--- a/ucm2/sof-soundwire/rt1316.conf
550++++ b/ucm2/sof-soundwire/rt1316.conf
551+@@ -47,8 +47,9 @@
552+ SectionDevice."Speaker" {
553+ Comment "Speaker"
554+
555+- Macro.num1.rt1316spk { ForAmps "[12]" Amp 1 Sel "L,L" }
556+- Macro.num2.rt1316spk { ForAmps "2" Amp 2 Sel "R,R" }
557++ Macro.num1.rt1316spk { ForAmps "1" Amp 1 Sel "L,R" }
558++ Macro.num2.rt1316spk { ForAmps "2" Amp 1 Sel "L,L" }
559++ Macro.num3.rt1316spk { ForAmps "2" Amp 2 Sel "R,R" }
560+
561+ EnableSequence [
562+ cset "name='Speaker Switch' on"
563+--- a/ucm2/sof-soundwire/rt1318.conf
564++++ b/ucm2/sof-soundwire/rt1318.conf
565+@@ -26,8 +26,9 @@
566+ SectionDevice."Speaker" {
567+ Comment "Speaker"
568+
569+- Macro.num1.rt1318spk { ForAmps "[12]" Amp 1 Sel "L,L" }
570+- Macro.num2.rt1318spk { ForAmps "2" Amp 2 Sel "R,R" }
571++ Macro.num1.rt1318spk { ForAmps "1" Amp 1 Sel "L,R" }
572++ Macro.num2.rt1318spk { ForAmps "2" Amp 1 Sel "L,L" }
573++ Macro.num3.rt1318spk { ForAmps "2" Amp 2 Sel "R,R" }
574+
575+ EnableSequence [
576+ cset "name='Speaker Switch' on"
577diff --git a/debian/patches/series b/debian/patches/series
578index b0525d9..0c93914 100644
579--- a/debian/patches/series
580+++ b/debian/patches/series
581@@ -10,3 +10,13 @@
582 0001-sof-soundwire-Use-one-file-for-speaker-codec-initial.patch
583 0002-sof-soundwire-Add-basic-support-for-basic-cs35l56-co.patch
584 0003-sof-soundwire-Add-basic-support-for-cs42l43.patch
585+0001-sof-soundwire-fix-rt1318-config-typo-in-rt1318spk-ma.patch
586+0002-sof-soundwire-fix-rt1318-config-copy-n-paste-error-i.patch
587+0003-sof-soundwire-rt1308-Fix-single-amp-configuration.patch
588+0004-sof-soundwire-rt1316-rt1318-fix-channel-selection-fo.patch
589+0001-sof-soundwire-Add-missing-match-for-cs42l43-speakers.patch
590+0002-sof-soundwire-Add-support-for-cs42l43-cs35l56-bridge.patch
591+0001-sof-soundwire-Change-map-control-names-to-make-them-.patch
592+0002-sof-soundwire-Add-sequence-for-controlling-Mic-Mute-.patch
593+0001-acppdmmach-add-support-for-ACP-7.0.patch
594+0001-sof-soundwire-Add-basic-support-for-cs42l43-s-speake.patch

Subscribers

People subscribed via source and target branches