diff -Nru alsa-ucm-conf-1.2.6.3/debian/changelog alsa-ucm-conf-1.2.6.3/debian/changelog --- alsa-ucm-conf-1.2.6.3/debian/changelog 2023-04-19 09:50:30.000000000 +0800 +++ alsa-ucm-conf-1.2.6.3/debian/changelog 2023-06-29 18:51:42.000000000 +0800 @@ -1,3 +1,12 @@ +alsa-ucm-conf (1.2.6.3-1ubuntu10) UNRELEASED; urgency=medium + + * d/p/0001-acp63-add-initial-support-for-AMD-Pink-Sardine-ACP63.patch + d/p/0002-acp63.conf-use-symbolic-link.patch + d/p/0003-acp62-add-initial-support-for-AMD-ACP-v6.2-RPL.patch + - Backport patches to add support AMD ACP RPL and Pink Sardine. (LP: #2025353) + + -- Aaron Ma Thu, 29 Jun 2023 18:51:42 +0800 + alsa-ucm-conf (1.2.6.3-1ubuntu9) lunar; urgency=medium * d/p/0006-sof-hda-dsp-Add-speaker-led-support.patch diff -Nru alsa-ucm-conf-1.2.6.3/debian/patches/0001-acp63-add-initial-support-for-AMD-Pink-Sardine-ACP63.patch alsa-ucm-conf-1.2.6.3/debian/patches/0001-acp63-add-initial-support-for-AMD-Pink-Sardine-ACP63.patch --- alsa-ucm-conf-1.2.6.3/debian/patches/0001-acp63-add-initial-support-for-AMD-Pink-Sardine-ACP63.patch 1970-01-01 08:00:00.000000000 +0800 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0001-acp63-add-initial-support-for-AMD-Pink-Sardine-ACP63.patch 2023-06-29 18:47:31.000000000 +0800 @@ -0,0 +1,40 @@ +From f9650636f41f2523d5a9e0cecb39190bc3a7bfad Mon Sep 17 00:00:00 2001 +From: Aaron Ma +Date: Wed, 21 Jun 2023 15:54:00 +0800 +Subject: [PATCH 1/3] acp63: add initial support for AMD Pink Sardine - ACP63 + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/327 +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/326 +Signed-off-by: Aaron Ma +Signed-off-by: Jaroslav Kysela +--- + ucm2/HDA/HDA.conf | 2 +- + ucm2/conf.d/acp63/acp63.conf | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + create mode 100644 ucm2/conf.d/acp63/acp63.conf + +diff --git a/ucm2/HDA/HDA.conf b/ucm2/HDA/HDA.conf +index 47dfc05..9317280 100644 +--- a/ucm2/HDA/HDA.conf ++++ b/ucm2/HDA/HDA.conf +@@ -3,7 +3,7 @@ Syntax 6 + 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|acp6x)$'}" ++Define.AcpCardId "$${find-card:field=name,return=id,regex='^(acp|acp6x|acp63)$'}" + Define.DeviceMic "Mic" + + If.dualcodec { +diff --git a/ucm2/conf.d/acp63/acp63.conf b/ucm2/conf.d/acp63/acp63.conf +new file mode 100644 +index 0000000..a90f20e +--- /dev/null ++++ b/ucm2/conf.d/acp63/acp63.conf +@@ -0,0 +1,3 @@ ++Syntax 3 ++ ++Include.linked.File "/common/linked.conf" +-- +2.34.1 + diff -Nru alsa-ucm-conf-1.2.6.3/debian/patches/0002-acp63.conf-use-symbolic-link.patch alsa-ucm-conf-1.2.6.3/debian/patches/0002-acp63.conf-use-symbolic-link.patch --- alsa-ucm-conf-1.2.6.3/debian/patches/0002-acp63.conf-use-symbolic-link.patch 1970-01-01 08:00:00.000000000 +0800 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0002-acp63.conf-use-symbolic-link.patch 2023-06-29 18:47:31.000000000 +0800 @@ -0,0 +1,32 @@ +From 65ba35a33dfcf6988d4a0f5b39ff428ab52b71ff Mon Sep 17 00:00:00 2001 +From: pseudoc +Date: Wed, 28 Jun 2023 17:23:55 +0800 +Subject: [PATCH 2/3] acp63.conf: use symbolic link + +Signed-off-by: Atlas Yu +Signed-off-by: Jaroslav Kysela +--- + ucm2/conf.d/acp63/acp63.conf | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + mode change 100644 => 120000 ucm2/conf.d/acp63/acp63.conf + +diff --git a/ucm2/conf.d/acp63/acp63.conf b/ucm2/conf.d/acp63/acp63.conf +deleted file mode 100644 +index a90f20e..0000000 +--- a/ucm2/conf.d/acp63/acp63.conf ++++ /dev/null +@@ -1,3 +0,0 @@ +-Syntax 3 +- +-Include.linked.File "/common/linked.conf" +diff --git a/ucm2/conf.d/acp63/acp63.conf b/ucm2/conf.d/acp63/acp63.conf +new file mode 120000 +index 0000000..7298c24 +--- /dev/null ++++ b/ucm2/conf.d/acp63/acp63.conf +@@ -0,0 +1 @@ ++../../common/linked-card.conf +\ No newline at end of file +-- +2.34.1 + diff -Nru alsa-ucm-conf-1.2.6.3/debian/patches/0003-acp62-add-initial-support-for-AMD-ACP-v6.2-RPL.patch alsa-ucm-conf-1.2.6.3/debian/patches/0003-acp62-add-initial-support-for-AMD-ACP-v6.2-RPL.patch --- alsa-ucm-conf-1.2.6.3/debian/patches/0003-acp62-add-initial-support-for-AMD-ACP-v6.2-RPL.patch 1970-01-01 08:00:00.000000000 +0800 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0003-acp62-add-initial-support-for-AMD-ACP-v6.2-RPL.patch 2023-06-29 18:47:31.000000000 +0800 @@ -0,0 +1,40 @@ +From 40d9c6c25c839255e549c65ecee1dabb3bf189d1 Mon Sep 17 00:00:00 2001 +From: pseudoc +Date: Wed, 28 Jun 2023 17:27:04 +0800 +Subject: [PATCH 3/3] acp62: add initial support for AMD ACP v6.2 RPL + +Also simplify the regex for AcpCardId. + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/332 +Signed-off-by: Atlas Yu +Signed-off-by: Jaroslav Kysela +--- + ucm2/HDA/HDA.conf | 2 +- + ucm2/conf.d/acp62/acp62.conf | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + create mode 120000 ucm2/conf.d/acp62/acp62.conf + +diff --git a/ucm2/HDA/HDA.conf b/ucm2/HDA/HDA.conf +index 9317280..83f3db2 100644 +--- a/ucm2/HDA/HDA.conf ++++ b/ucm2/HDA/HDA.conf +@@ -3,7 +3,7 @@ Syntax 6 + 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|acp6x|acp63)$'}" ++Define.AcpCardId "$${find-card:field=name,return=id,regex='^acp(|6[23x])$'}" + Define.DeviceMic "Mic" + + If.dualcodec { +diff --git a/ucm2/conf.d/acp62/acp62.conf b/ucm2/conf.d/acp62/acp62.conf +new file mode 120000 +index 0000000..7298c24 +--- /dev/null ++++ b/ucm2/conf.d/acp62/acp62.conf +@@ -0,0 +1 @@ ++../../common/linked-card.conf +\ No newline at end of file +-- +2.34.1 + diff -Nru alsa-ucm-conf-1.2.6.3/debian/patches/series alsa-ucm-conf-1.2.6.3/debian/patches/series --- alsa-ucm-conf-1.2.6.3/debian/patches/series 2023-04-19 09:50:30.000000000 +0800 +++ alsa-ucm-conf-1.2.6.3/debian/patches/series 2023-06-29 18:51:31.000000000 +0800 @@ -12,3 +12,6 @@ ucm2-sof-soundwire-Update-Mic-LED-settings.patch 0001-ucm2-HDA-Update-Mic-LED-settings-for-ACP-DMIC.patch 0006-sof-hda-dsp-Add-speaker-led-support.patch +0001-acp63-add-initial-support-for-AMD-Pink-Sardine-ACP63.patch +0002-acp63.conf-use-symbolic-link.patch +0003-acp62-add-initial-support-for-AMD-ACP-v6.2-RPL.patch