Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package alsa-ucm-conf for openSUSE:Factory checked in at 2025-12-18 18:29:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-ucm-conf (Old) and /work/SRC/openSUSE:Factory/.alsa-ucm-conf.new.1928 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alsa-ucm-conf" Thu Dec 18 18:29:17 2025 rev:35 rq:1323359 version:1.2.15 Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-ucm-conf/alsa-ucm-conf.changes 2025-12-09 12:48:13.226532824 +0100 +++ /work/SRC/openSUSE:Factory/.alsa-ucm-conf.new.1928/alsa-ucm-conf.changes 2025-12-18 18:29:29.120657648 +0100 @@ -1,0 +2,8 @@ +Wed Dec 17 11:40:48 UTC 2025 - Takashi Iwai <[email protected]> + +- Backport upstream fixes (bsc#1255123): + 0001-sof-soundwire-third-fix-for-multi-codec.patch + 0002-ucm2-sof-soundwire-Simplify-cs42l45-configs.patch + 0003-ucm2-codecs-rt722-add-condition-to-SetLED-for-mic.patch + +------------------------------------------------------------------- New: ---- 0001-sof-soundwire-third-fix-for-multi-codec.patch 0002-ucm2-sof-soundwire-Simplify-cs42l45-configs.patch 0003-ucm2-codecs-rt722-add-condition-to-SetLED-for-mic.patch ----------(New B)---------- New:- Backport upstream fixes (bsc#1255123): 0001-sof-soundwire-third-fix-for-multi-codec.patch 0002-ucm2-sof-soundwire-Simplify-cs42l45-configs.patch New: 0001-sof-soundwire-third-fix-for-multi-codec.patch 0002-ucm2-sof-soundwire-Simplify-cs42l45-configs.patch 0003-ucm2-codecs-rt722-add-condition-to-SetLED-for-mic.patch New: 0002-ucm2-sof-soundwire-Simplify-cs42l45-configs.patch 0003-ucm2-codecs-rt722-add-condition-to-SetLED-for-mic.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-ucm-conf.spec ++++++ --- /var/tmp/diff_new_pack.eFVafI/_old 2025-12-18 18:29:29.868689063 +0100 +++ /var/tmp/diff_new_pack.eFVafI/_new 2025-12-18 18:29:29.872689232 +0100 @@ -27,6 +27,9 @@ # from https://www.alsa-project.org/files/pub/gpg-release-key-v1.txt Source2: alsa-ucm-conf.keyring # upstream fixes +Patch1: 0001-sof-soundwire-third-fix-for-multi-codec.patch +Patch2: 0002-ucm2-sof-soundwire-Simplify-cs42l45-configs.patch +Patch3: 0003-ucm2-codecs-rt722-add-condition-to-SetLED-for-mic.patch BuildRequires: fdupes BuildArch: noarch Requires: libasound2 >= 1.2.6.1 ++++++ 0001-sof-soundwire-third-fix-for-multi-codec.patch ++++++ >From d57d800c6a5a77e6c475719b0297bebb098f7533 Mon Sep 17 00:00:00 2001 From: Maciej Strozek <[email protected]> Date: Tue, 9 Dec 2025 13:00:44 +0000 Subject: [PATCH 1/3] sof-soundwire: third fix for multi-codec Ensure MultiCodec-based actions are only done when MultiCodec1 is not empty Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/658 Signed-off-by: Maciej Strozek <[email protected]> Signed-off-by: Jaroslav Kysela <[email protected]> --- ucm2/sof-soundwire/sof-soundwire.conf | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf index 7f9c7dcf0d8d..895f479933f4 100644 --- a/ucm2/sof-soundwire/sof-soundwire.conf +++ b/ucm2/sof-soundwire/sof-soundwire.conf @@ -72,8 +72,9 @@ If.multi_init { If.multi_speaker { Condition { Type RegexMatch - Regex "(${var:MultiCodec1}(-sdca)?)" - String "${var:SpeakerCodec1}" + # guard with "=" to avoid empty string matching + Regex "=(${var:MultiCodec1}(-sdca)?)=" + String "=${var:SpeakerCodec1}=" } True { Define.SpeakerCodec1 "" @@ -83,8 +84,9 @@ If.multi_speaker { If.multi_mic { Condition { Type RegexMatch - Regex "(${var:MultiCodec1}(-sdca)?)" - String "${var:MicCodec1}" + # guard with "=" to avoid empty string matching + Regex "=(${var:MultiCodec1}(-sdca)?)=" + String "=${var:MicCodec1}=" } True { Define.MicCodec1 "" @@ -94,8 +96,9 @@ If.multi_mic { If.multi_headset { Condition { Type RegexMatch - Regex "(${var:MultiCodec1}(-sdca)?)" - String "${var:HeadsetCodec1}" + # guard with "=" to avoid empty string matching + Regex "=(${var:MultiCodec1}(-sdca)?)=" + String "=${var:HeadsetCodec1}=" } True { Define.HeadsetCodec1 "" -- 2.52.0 ++++++ 0002-ucm2-sof-soundwire-Simplify-cs42l45-configs.patch ++++++ >From 51bada5f0c1b634b5db92de428f33c0188e68e82 Mon Sep 17 00:00:00 2001 From: Maciej Strozek <[email protected]> Date: Fri, 28 Nov 2025 16:08:23 +0000 Subject: [PATCH 2/3] ucm2: sof-soundwire: Simplify cs42l45 configs Simplify cs42l45 configs following machine driver changes [1] which bring normal switches instead of mute switches. [1] https://lore.kernel.org/all/[email protected]/ Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/655 Signed-off-by: Maciej Strozek <[email protected]> Signed-off-by: Jaroslav Kysela <[email protected]> --- ucm2/codecs/cs42l45-dmic/init.conf | 17 +++++++++++++++-- ucm2/codecs/cs42l45/init.conf | 24 ++++++++++++++++++++++++ ucm2/sof-soundwire/cs42l45-dmic.conf | 8 ++------ ucm2/sof-soundwire/cs42l45.conf | 18 +++--------------- ucm2/sof-soundwire/sof-soundwire.conf | 2 +- 5 files changed, 45 insertions(+), 24 deletions(-) create mode 100644 ucm2/codecs/cs42l45/init.conf diff --git a/ucm2/codecs/cs42l45-dmic/init.conf b/ucm2/codecs/cs42l45-dmic/init.conf index 6dd19bbf0ee8..deefb3d19cdc 100644 --- a/ucm2/codecs/cs42l45-dmic/init.conf +++ b/ucm2/codecs/cs42l45-dmic/init.conf @@ -1,9 +1,22 @@ # cs42l45 specific control settings +LibraryConfig.remap.Config { + ctl.default.map { + "name='cs42l45 Microphone Capture Switch'" { + "name='cs42l45 FU 113 Channel Switch'".vindex.0 0 + "name='cs42l45 FU 113 Channel Switch'".vindex.1 1 + } + "name='cs42l45 Microphone Capture Volume'" { + "name='cs42l45 FU 113 Channel Volume'".vindex.0 0 + "name='cs42l45 FU 113 Channel Volume'".vindex.1 1 + } + } +} + BootSequence [ - cset "name='cs42l45 FU 113 Mute Switch' 0" + cset "name='cs42l45 FU 113 Channel Switch' 0" ] Macro [ - { SetLED { LED="mic" Action="attach" CtlId="cs42l45 FU 113 Mute Switch" Mode="follow-route"} } + { SetLED { LED="mic" Action="attach" CtlId="cs42l45 FU 113 Channel Switch"} } ] diff --git a/ucm2/codecs/cs42l45/init.conf b/ucm2/codecs/cs42l45/init.conf new file mode 100644 index 000000000000..f4aee4afcb11 --- /dev/null +++ b/ucm2/codecs/cs42l45/init.conf @@ -0,0 +1,24 @@ +# cs42l45 specific control settings + +LibraryConfig.remap.Config { + ctl.default.map { + "name='cs42l45 Jack Microphone Capture Switch'" { + "name='cs42l45 FU 36 Channel Switch'".vindex.0 0 + "name='cs42l45 FU 36 Channel Switch'".vindex.1 1 + } + "name='cs42l45 Jack Microphone Capture Volume'" { + "name='cs42l45 FU 36 Channel Volume'".vindex.0 0 + "name='cs42l45 FU 36 Channel Volume'".vindex.1 1 + } + } + ctl.default.map { + "name='cs42l45 Headphone Playback Switch'" { + "name='cs42l45 FU 41 Channel Switch'".vindex.0 0 + "name='cs42l45 FU 41 Channel Switch'".vindex.1 1 + } + "name='cs42l45 Headphone Playback Volume'" { + "name='cs42l45 FU 41 Channel Volume'".vindex.0 0 + "name='cs42l45 FU 41 Channel Volume'".vindex.1 1 + } + } +} \ No newline at end of file diff --git a/ucm2/sof-soundwire/cs42l45-dmic.conf b/ucm2/sof-soundwire/cs42l45-dmic.conf index 9477cbac7674..d46808e3187e 100644 --- a/ucm2/sof-soundwire/cs42l45-dmic.conf +++ b/ucm2/sof-soundwire/cs42l45-dmic.conf @@ -7,18 +7,14 @@ SectionDevice."Mic" { "Headset" ] - EnableSequence [ - cset "name='cs42l45 FU 113 Mute Switch' 0" - ] - DisableSequence [ - cset "name='cs42l45 FU 113 Mute Switch' 1" + cset "name='cs42l45 FU 113 Channel Switch' 0" ] Value { CapturePriority 100 CapturePCM "hw:${CardId},4" CaptureMixer "default:${CardId}" - CaptureVolume "cs42l45 FU 113 Channel Volume" + CaptureMixerElem "cs42l45 Microphone" } } diff --git a/ucm2/sof-soundwire/cs42l45.conf b/ucm2/sof-soundwire/cs42l45.conf index ba610480eaad..c88562a03581 100644 --- a/ucm2/sof-soundwire/cs42l45.conf +++ b/ucm2/sof-soundwire/cs42l45.conf @@ -3,19 +3,11 @@ SectionDevice."Headphones" { Comment "Headphones" - EnableSequence [ - cset "name='cs42l45 FU 41 Mute Switch' 0" - ] - - DisableSequence [ - cset "name='cs42l45 FU 41 Mute Switch' 1" - ] - Value { PlaybackPriority 200 PlaybackPCM "hw:${CardId},0" PlaybackMixer "default:${CardId}" - PlaybackVolume "cs42l45 FU 41 Channel Volume" + PlaybackMixerElem "cs42l45 Headphone" JackControl "cs42l45 OT 43 Headphone Jack" } } @@ -23,19 +15,15 @@ SectionDevice."Headphones" { SectionDevice."Headset" { Comment "Jack Microphone" - EnableSequence [ - cset "name='cs42l45 FU 36 Mute Switch' 0" - ] - DisableSequence [ - cset "name='cs42l45 FU 36 Mute Switch' 1" + cset "name='cs42l45 FU 36 Channel Switch' 0" ] Value { CapturePriority 200 CapturePCM "hw:${CardId},1" CaptureMixer "default:${CardId}" - CaptureVolume "cs42l45 FU 36 Channel Volume" + CaptureMixerElem "cs42l45 Jack Microphone" JackControl "cs42l45 IT 31 Microphone Jack" } } diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf index 895f479933f4..7a00209e940a 100644 --- a/ucm2/sof-soundwire/sof-soundwire.conf +++ b/ucm2/sof-soundwire/sof-soundwire.conf @@ -117,7 +117,7 @@ If.spk_init { If.hs_init { Condition { Type RegexMatch - Regex "(cs42l43|rt5682|rt700|rt711|rt713(-sdca)?)" + Regex "(cs42l43|cs42l45|rt5682|rt700|rt711|rt713(-sdca)?)" String "${var:HeadsetCodec1}" } True.Include.hs_init.File "/codecs/${var:HeadsetCodec1}/init.conf" -- 2.52.0 ++++++ 0003-ucm2-codecs-rt722-add-condition-to-SetLED-for-mic.patch ++++++ >From 5d0d2bd660b4378f802c94be3eadd8375c4c7a3a Mon Sep 17 00:00:00 2001 From: Shuming Fan <[email protected]> Date: Tue, 9 Dec 2025 15:40:49 +0800 Subject: [PATCH 3/3] ucm2: codecs: rt722: add condition to SetLED for mic Some SKUs don't have the internal mic, so the patch adds the condition to check whether the SKU has the internal mic or not. Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/657 Signed-off-by: Shuming Fan <[email protected]> Signed-off-by: Jaroslav Kysela <[email protected]> --- ucm2/codecs/rt722/init.conf | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ucm2/codecs/rt722/init.conf b/ucm2/codecs/rt722/init.conf index c820e55e4711..40f245856d43 100644 --- a/ucm2/codecs/rt722/init.conf +++ b/ucm2/codecs/rt722/init.conf @@ -10,4 +10,11 @@ BootSequence [ cset "name='rt722 FU0F Capture Volume' 63" ] -Macro [{ SetLED { LED="mic" Action="attach" CtlId="rt722 FU1E Capture Switch" } }] +If.mic_init_rt722 { + Condition { + Type String + Needle "rt722" + Haystack "${var:MicCodec1}" + } + True.Macro [{ SetLED { LED="mic" Action="attach" CtlId="rt722 FU1E Capture Switch" } }] +} -- 2.52.0
