diff -pruN 1.2.6.3-1/debian/changelog 1.2.6.3-1ubuntu1/debian/changelog --- 1.2.6.3-1/debian/changelog 2022-01-12 00:00:23.000000000 +0000 +++ 1.2.6.3-1ubuntu1/debian/changelog 2022-03-29 13:35:14.000000000 +0000 @@ -1,3 +1,10 @@ +alsa-ucm-conf (1.2.6.3-1ubuntu1) jammy; urgency=medium + + * Backport patch to fix ACP LED for HDMI devices + * Backport patch to enable ACP6x. (LP: #1966957) + + -- Mario Limonciello Tue, 29 Mar 2022 08:35:14 -0500 + alsa-ucm-conf (1.2.6.3-1) unstable; urgency=medium * New upstream release. diff -pruN 1.2.6.3-1/debian/patches/0004-HDA-acp-avoid-to-create-Mic-ACP-LED-control-for-the-.patch 1.2.6.3-1ubuntu1/debian/patches/0004-HDA-acp-avoid-to-create-Mic-ACP-LED-control-for-the-.patch --- 1.2.6.3-1/debian/patches/0004-HDA-acp-avoid-to-create-Mic-ACP-LED-control-for-the-.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.6.3-1ubuntu1/debian/patches/0004-HDA-acp-avoid-to-create-Mic-ACP-LED-control-for-the-.patch 2022-03-29 13:28:30.000000000 +0000 @@ -0,0 +1,47 @@ +From 369f8b497e15a993d411df81a39ee5c8c1433363 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Fri, 7 Jan 2022 10:57:48 +0100 +Subject: [PATCH 1/2] HDA-acp: avoid to create 'Mic ACP LED' control for the + HDMI card + +BugLink: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1849#note_1210933 +Signed-off-by: Jaroslav Kysela +--- + ucm2/HDA/HDA.conf | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 deletions(-) + +diff --git a/ucm2/HDA/HDA.conf b/ucm2/HDA/HDA.conf +index 003d941..ab80fa5 100644 +--- a/ucm2/HDA/HDA.conf ++++ b/ucm2/HDA/HDA.conf +@@ -43,13 +43,21 @@ If.use { + Comment "Play HiFi quality Music" + } + +- Include.init.File "/HDA/init.conf" ++ If.analog { ++ Condition { ++ Type ControlExists ++ Control "name='Master Playback Switch'" ++ } ++ True { ++ Include.init.File "/HDA/init.conf" + +- FixedBootSequence [ +- cset-new "name='Mic ACP LED Capture Switch' type=bool,count=1 off" +- exec "-/sbin/modprobe snd_ctl_led" +- sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:Mic ACP LED Capture Switch" +- ] ++ FixedBootSequence [ ++ cset-new "name='Mic ACP LED Capture Switch' type=bool,count=1 off" ++ exec "-/sbin/modprobe snd_ctl_led" ++ sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:Mic ACP LED Capture Switch" ++ ] ++ } ++ } + } + } + +-- +2.34.1 + diff -pruN 1.2.6.3-1/debian/patches/0005-acp6x-add-initial-support-for-AMD-Yellow-Carp-ACP6x.patch 1.2.6.3-1ubuntu1/debian/patches/0005-acp6x-add-initial-support-for-AMD-Yellow-Carp-ACP6x.patch --- 1.2.6.3-1/debian/patches/0005-acp6x-add-initial-support-for-AMD-Yellow-Carp-ACP6x.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.6.3-1ubuntu1/debian/patches/0005-acp6x-add-initial-support-for-AMD-Yellow-Carp-ACP6x.patch 2022-03-29 13:28:30.000000000 +0000 @@ -0,0 +1,37 @@ +From 642db9b51ff7f8ad022fee0362871ceaa46599bf Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Thu, 27 Jan 2022 21:50:32 +0100 +Subject: [PATCH 2/2] acp6x: add initial support for AMD Yellow Carp - ACP6x + +Link: https://github.com/alsa-project/alsa-ucm-conf/issues/136 +Signed-off-by: Jaroslav Kysela +--- + ucm2/HDA/HDA.conf | 2 +- + ucm2/conf.d/acp6x/acp6x.conf | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + create mode 120000 ucm2/conf.d/acp6x/acp6x.conf + +diff --git a/ucm2/HDA/HDA.conf b/ucm2/HDA/HDA.conf +index ab80fa5..411f2e7 100644 +--- a/ucm2/HDA/HDA.conf ++++ b/ucm2/HDA/HDA.conf +@@ -3,7 +3,7 @@ Syntax 4 + Define.Use "" # a non-empty string to use UCM configuration for HDA devices + Define.Done "" # a non-empty string to skip the end error + +-Define.AcpCardId "$${find-card:field=name,return=id,regex='^acp$'}" ++Define.AcpCardId "$${find-card:field=name,return=id,regex='^(acp|acp6x)$'}" + Define.DeviceMic "Mic" + + If.dualcodec { +diff --git a/ucm2/conf.d/acp6x/acp6x.conf b/ucm2/conf.d/acp6x/acp6x.conf +new file mode 120000 +index 0000000..7298c24 +--- /dev/null ++++ b/ucm2/conf.d/acp6x/acp6x.conf +@@ -0,0 +1 @@ ++../../common/linked-card.conf +\ No newline at end of file +-- +2.34.1 + diff -pruN 1.2.6.3-1/debian/patches/series 1.2.6.3-1ubuntu1/debian/patches/series --- 1.2.6.3-1/debian/patches/series 2022-01-11 23:47:43.000000000 +0000 +++ 1.2.6.3-1ubuntu1/debian/patches/series 2022-03-29 13:30:06.000000000 +0000 @@ -1,3 +1,5 @@ 0001-ucm2-add-PinePhone-configuration.patch 0002-ucm2-add-PineTab-configuration.patch 0003-ucm2-add-improved-Librem-5-profiles.patch +0004-HDA-acp-avoid-to-create-Mic-ACP-LED-control-for-the-.patch +0005-acp6x-add-initial-support-for-AMD-Yellow-Carp-ACP6x.patch