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 2022-10-11 16:09:17.000000000 +0800 +++ alsa-ucm-conf-1.2.6.3/debian/changelog 2022-12-26 14:53:41.000000000 +0800 @@ -1,3 +1,9 @@ +alsa-ucm-conf (1.2.6.3-1ubuntu1.2) jammy; urgency=medium + + * Backport patch for speaker AMP-ALC1318 support. (LP: #1997946) + + -- Kai-Chuan Hsieh Mon, 26 Dec 2022 14:53:41 +0800 + alsa-ucm-conf (1.2.6.3-1ubuntu1.1) jammy; urgency=medium * Backport patch to fix sof-hda-dsp Dmic0 initial. (LP: #1992435) diff -Nru alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm2-sof-soundwire-add-basic-settings-for-RT1318-SDC.patch alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm2-sof-soundwire-add-basic-settings-for-RT1318-SDC.patch --- alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm2-sof-soundwire-add-basic-settings-for-RT1318-SDC.patch 1970-01-01 08:00:00.000000000 +0800 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm2-sof-soundwire-add-basic-settings-for-RT1318-SDC.patch 2022-12-26 14:53:28.000000000 +0800 @@ -0,0 +1,69 @@ +From c82c400fb653292bbf0570e278d60e1ba14cc341 Mon Sep 17 00:00:00 2001 +From: Shuming Fan +Date: Wed, 16 Nov 2022 17:36:51 +0800 +Subject: [PATCH] ucm2: sof-soundwire: add basic settings for RT1318 SDCA + device + +Add support for rt1318 amplifier + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/242 +Signed-off-by: Shuming Fan +Signed-off-by: Jaroslav Kysela +--- + ucm2/sof-soundwire/rt1318-1.conf | 20 ++++++++++++++++++++ + ucm2/sof-soundwire/rt1318-2.conf | 25 +++++++++++++++++++++++++ + 2 files changed, 45 insertions(+) + create mode 100644 ucm2/sof-soundwire/rt1318-1.conf + create mode 100644 ucm2/sof-soundwire/rt1318-2.conf + +--- /dev/null ++++ b/ucm2/sof-soundwire/rt1318-1.conf +@@ -0,0 +1,20 @@ ++# Use case Configuration for sof-soundwire card ++ ++SectionDevice."Speaker" { ++ Comment "Speaker" ++ ++ EnableSequence [ ++ cset "name='rt1318-1 DAC Switch' 1" ++ cset "name='Speaker Switch' on" ++ ] ++ ++ DisableSequence [ ++ cset "name='rt1318-1 DAC Switch' 0" ++ cset "name='Speaker Switch' off" ++ ] ++ ++ Value { ++ PlaybackPriority 100 ++ PlaybackPCM "hw:${CardId},2" ++ } ++} +--- /dev/null ++++ b/ucm2/sof-soundwire/rt1318-2.conf +@@ -0,0 +1,25 @@ ++# Use case Configuration for sof-soundwire card ++ ++SectionDevice."Speaker" { ++ Comment "Speaker" ++ ++ EnableSequence [ ++ cset "name='rt1318-1 RX Channel Select' L,L" ++ cset "name='rt1318-2 RX Channel Select' R,R" ++ ++ cset "name='rt1318-1 DAC Switch' 1" ++ cset "name='rt1318-2 DAC Switch' 1" ++ cset "name='Speaker Switch' on" ++ ] ++ ++ DisableSequence [ ++ cset "name='rt1318-1 DAC Switch' 0" ++ cset "name='rt1318-2 DAC Switch' 0" ++ cset "name='Speaker Switch' off" ++ ] ++ ++ Value { ++ PlaybackPriority 100 ++ PlaybackPCM "hw:${CardId},2" ++ } ++} diff -Nru alsa-ucm-conf-1.2.6.3/debian/patches/0005-acp6x-add-initial-support-for-AMD-Yellow-Carp-ACP6x.patch alsa-ucm-conf-1.2.6.3/debian/patches/0005-acp6x-add-initial-support-for-AMD-Yellow-Carp-ACP6x.patch --- alsa-ucm-conf-1.2.6.3/debian/patches/0005-acp6x-add-initial-support-for-AMD-Yellow-Carp-ACP6x.patch 2022-03-29 21:28:30.000000000 +0800 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0005-acp6x-add-initial-support-for-AMD-Yellow-Carp-ACP6x.patch 2022-12-26 14:53:41.000000000 +0800 @@ -11,11 +11,9 @@ 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 +@@ -3,7 +3,7 @@ Define.Use "" # a non-empty string to use UCM configuration for HDA devices Define.Done "" # a non-empty string to skip the end error @@ -24,14 +22,9 @@ 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 - +@@ -0,0 +1,3 @@ ++Syntax 3 ++ ++Include.linked.File "/common/linked.conf" 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 2022-10-11 16:09:17.000000000 +0800 +++ alsa-ucm-conf-1.2.6.3/debian/patches/series 2022-12-26 14:53:20.000000000 +0800 @@ -4,3 +4,4 @@ 0004-HDA-acp-avoid-to-create-Mic-ACP-LED-control-for-the-.patch 0005-acp6x-add-initial-support-for-AMD-Yellow-Carp-ACP6x.patch sof-hda-dsp-fix-multiple-If.dmic-blocks.patch +0001-ucm2-sof-soundwire-add-basic-settings-for-RT1318-SDC.patch