diff -pruN 1.2.6.3-1/debian/changelog 1.2.6.3-1ubuntu6/debian/changelog --- 1.2.6.3-1/debian/changelog 2022-01-12 00:00:23.000000000 +0000 +++ 1.2.6.3-1ubuntu6/debian/changelog 2023-01-17 09:52:51.000000000 +0000 @@ -1,3 +1,40 @@ +alsa-ucm-conf (1.2.6.3-1ubuntu6) lunar; urgency=medium + + * d/p/ucm2-sof-hda-dsp-Update-Mic-LED-settings.patch + d/p/ucm2-sof-hda-dsp-If.devdmic-cleanup.patch + - Backport patch to fix micmute LED. (LP: #2002373) + + * d/p/sof-hda-dsp-Set-Dmic0-Capture-Switch-on.patch + - Backport patch to fix capture switch default value. (LP: #2001896) + + -- Andy Chi Tue, 17 Jan 2023 17:52:51 +0800 + +alsa-ucm-conf (1.2.6.3-1ubuntu5) lunar; urgency=medium + + * d/p/sof-soundwire-set-PGA-capture-switch-for-rt715-mic-in-Boo.patch: + - fix microphone recording on rt715 (LP: #2000465) + + -- Andy Chi Mon, 26 Dec 2022 16:50:47 +0800 + +alsa-ucm-conf (1.2.6.3-1ubuntu3.1) lunar; urgency=medium + + * Backport patch for speaker AMP-ALC1318 support. (LP: #1997946) + + -- Kai-Chuan Hsieh Mon, 26 Dec 2022 15:12:24 +0800 + +alsa-ucm-conf (1.2.6.3-1ubuntu2) kinetic; urgency=medium + + * Backport patch to fix sof-hda-dsp Dmic0 initial. (LP: #1992435) + + -- Dirk Su Tue, 11 Oct 2022 16:09:17 +0800 + +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/control 1.2.6.3-1ubuntu6/debian/control --- 1.2.6.3-1/debian/control 2022-01-11 23:26:21.000000000 +0000 +++ 1.2.6.3-1ubuntu6/debian/control 2022-10-11 08:09:17.000000000 +0000 @@ -1,7 +1,8 @@ Source: alsa-ucm-conf Section: libs Priority: optional -Maintainer: Debian ALSA Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian ALSA Maintainers Uploaders: Jordi Mallach , Elimar Riesebieter , Luke Yelavich diff -pruN 1.2.6.3-1/debian/patches/0001-ucm2-sof-soundwire-add-basic-settings-for-RT1318-SDC.patch 1.2.6.3-1ubuntu6/debian/patches/0001-ucm2-sof-soundwire-add-basic-settings-for-RT1318-SDC.patch --- 1.2.6.3-1/debian/patches/0001-ucm2-sof-soundwire-add-basic-settings-for-RT1318-SDC.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.6.3-1ubuntu6/debian/patches/0001-ucm2-sof-soundwire-add-basic-settings-for-RT1318-SDC.patch 2022-12-26 07:12:24.000000000 +0000 @@ -0,0 +1,78 @@ +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 + +diff --git a/ucm2/sof-soundwire/rt1318-1.conf b/ucm2/sof-soundwire/rt1318-1.conf +new file mode 100644 +index 0000000..13d77e1 +--- /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" ++ } ++} +diff --git a/ucm2/sof-soundwire/rt1318-2.conf b/ucm2/sof-soundwire/rt1318-2.conf +new file mode 100644 +index 0000000..5602470 +--- /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" ++ } ++} +-- +2.34.1 + 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-1ubuntu6/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-1ubuntu6/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-1ubuntu6/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-1ubuntu6/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-1ubuntu6/debian/patches/series --- 1.2.6.3-1/debian/patches/series 2022-01-11 23:47:43.000000000 +0000 +++ 1.2.6.3-1ubuntu6/debian/patches/series 2023-01-17 09:52:51.000000000 +0000 @@ -1,3 +1,11 @@ 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 +sof-hda-dsp-fix-multiple-If.dmic-blocks.patch +0001-ucm2-sof-soundwire-add-basic-settings-for-RT1318-SDC.patch +sof-soundwire-set-PGA-capture-switch-for-rt715-mic-i.patch +ucm2-sof-hda-dsp-Update-Mic-LED-settings.patch +ucm2-sof-hda-dsp-If.devdmic-cleanup.patch +sof-hda-dsp-Set-Dmic0-Capture-Switch-on.patch diff -pruN 1.2.6.3-1/debian/patches/sof-hda-dsp-fix-multiple-If.dmic-blocks.patch 1.2.6.3-1ubuntu6/debian/patches/sof-hda-dsp-fix-multiple-If.dmic-blocks.patch --- 1.2.6.3-1/debian/patches/sof-hda-dsp-fix-multiple-If.dmic-blocks.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.6.3-1ubuntu6/debian/patches/sof-hda-dsp-fix-multiple-If.dmic-blocks.patch 2022-10-11 08:09:17.000000000 +0000 @@ -0,0 +1,34 @@ +From 8170fffa7bad33c67b7c59ef5d98d92c0c742e91 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 9 Feb 2022 16:19:31 +0100 +Subject: [PATCH] sof-hda-dsp: fix multiple If.dmic blocks +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix multiple If.dmic blocks - rename the first to devdmic +initialization. + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/132 +Reported-by: Kacper Michajłow +Signed-off-by: Jaroslav Kysela +--- + ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +index b47777b..eb243d1 100644 +--- a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf ++++ b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +@@ -3,7 +3,7 @@ Syntax 4 + Define.DeviceMic "Mic" + Define.DeviceDmic "" + +-If.dmic { ++If.devdmic { + Condition { + Type String + Haystack "${CardComponents}" +-- +2.34.1 + diff -pruN 1.2.6.3-1/debian/patches/sof-hda-dsp-Set-Dmic0-Capture-Switch-on.patch 1.2.6.3-1ubuntu6/debian/patches/sof-hda-dsp-Set-Dmic0-Capture-Switch-on.patch --- 1.2.6.3-1/debian/patches/sof-hda-dsp-Set-Dmic0-Capture-Switch-on.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.6.3-1ubuntu6/debian/patches/sof-hda-dsp-Set-Dmic0-Capture-Switch-on.patch 2023-01-17 09:52:51.000000000 +0000 @@ -0,0 +1,26 @@ +From: Kai-Chuan Hsieh +Date: Mon, 26 Dec 2022 10:24:20 +0800 +Subject: sof-hda-dsp: Set Dmic0 Capture Switch on + +Internal micrphone default is off after fresh installation. +Add operation to set the control on to align with other architecture. + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/259 +Signed-off-by: Kai-Chuan Hsieh +Signed-off-by: Jaroslav Kysela +--- + ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +index 791b26b..e1b9a56 100644 +--- a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf ++++ b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +@@ -83,6 +83,7 @@ If.dmic { + } + True.BootSequence [ + cset "name='Dmic0 Capture Volume' 70%" ++ cset "name='Dmic0 Capture Switch' on" + ] + } + } diff -pruN 1.2.6.3-1/debian/patches/sof-soundwire-set-PGA-capture-switch-for-rt715-mic-i.patch 1.2.6.3-1ubuntu6/debian/patches/sof-soundwire-set-PGA-capture-switch-for-rt715-mic-i.patch --- 1.2.6.3-1/debian/patches/sof-soundwire-set-PGA-capture-switch-for-rt715-mic-i.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.6.3-1ubuntu6/debian/patches/sof-soundwire-set-PGA-capture-switch-for-rt715-mic-i.patch 2022-12-26 08:50:47.000000000 +0000 @@ -0,0 +1,31 @@ +From e395d7b743584cba60876b6356fb3bc7834992aa Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 26 Dec 2022 09:20:51 +0100 +Subject: [PATCH] sof-soundwire: set PGA capture switch for rt715 mic in + BootSequence + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/issues/255 +Signed-off-by: Jaroslav Kysela +--- + ucm2/sof-soundwire/sof-soundwire.conf | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +Index: alsa-ucm-conf/ucm2/sof-soundwire/sof-soundwire.conf +=================================================================== +--- alsa-ucm-conf.orig/ucm2/sof-soundwire/sof-soundwire.conf ++++ alsa-ucm-conf/ucm2/sof-soundwire/sof-soundwire.conf +@@ -61,3 +61,14 @@ If.mic_init { + } + True.Include.mic_init.File "/codecs/${var:MicCodec1}/init.conf" + } ++ ++If.mic_init_rt715 { ++ Condition { ++ Type String ++ Needle "rt715" ++ Haystack "${var:MicCodec1}" ++ } ++ True.BootSequence [ ++ cset "name='PGA5.0 5 Master Capture Switch' 1" ++ ] ++} diff -pruN 1.2.6.3-1/debian/patches/ucm2-sof-hda-dsp-If.devdmic-cleanup.patch 1.2.6.3-1ubuntu6/debian/patches/ucm2-sof-hda-dsp-If.devdmic-cleanup.patch --- 1.2.6.3-1/debian/patches/ucm2-sof-hda-dsp-If.devdmic-cleanup.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.6.3-1ubuntu6/debian/patches/ucm2-sof-hda-dsp-If.devdmic-cleanup.patch 2023-01-17 09:52:51.000000000 +0000 @@ -0,0 +1,31 @@ +From: Jaroslav Kysela +Date: Wed, 7 Dec 2022 15:48:05 +0100 +Subject: ucm2: sof-hda-dsp - If.devdmic cleanup + +Simplify the If.devdmic block. + +Signed-off-by: Jaroslav Kysela +--- + ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +index 403f7a6..791b26b 100644 +--- a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf ++++ b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +@@ -11,6 +11,7 @@ If.devdmic { + } + True { + Define.DeviceDmic "Mic1" ++ Define.DeviceMic "Mic2" + FixedBootSequence [ + # + # users expect to turn the LED on when only internal +@@ -20,7 +21,6 @@ If.devdmic { + sysw "-/class/sound/ctl-led/mic/card${CardNumber}/detach:Capture Switch" + ] + } +- True.Define.DeviceMic "Mic2" + } + + SectionUseCase."HiFi" { diff -pruN 1.2.6.3-1/debian/patches/ucm2-sof-hda-dsp-Update-Mic-LED-settings.patch 1.2.6.3-1ubuntu6/debian/patches/ucm2-sof-hda-dsp-Update-Mic-LED-settings.patch --- 1.2.6.3-1/debian/patches/ucm2-sof-hda-dsp-Update-Mic-LED-settings.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.6.3-1ubuntu6/debian/patches/ucm2-sof-hda-dsp-Update-Mic-LED-settings.patch 2023-01-17 09:52:51.000000000 +0000 @@ -0,0 +1,39 @@ +From: Jaroslav Kysela +Date: Wed, 7 Dec 2022 10:18:04 +0100 +Subject: ucm2: sof-hda-dsp: Update Mic LED settings + +Users expect to turn the LED on when only internal mic is off, but +it makes sense to turn this LED when all internal inputs are off. + +This configuration may be changed when the affected applications +are updated. + +BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=2134824 +Signed-off-by: Jaroslav Kysela +--- + ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +index eb243d1..403f7a6 100644 +--- a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf ++++ b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +@@ -9,7 +9,17 @@ If.devdmic { + Haystack "${CardComponents}" + Needle "cfg-dmics:" + } +- True.Define.DeviceDmic "Mic1" ++ True { ++ Define.DeviceDmic "Mic1" ++ FixedBootSequence [ ++ # ++ # users expect to turn the LED on when only internal ++ # mic is off, but it makes sense to turn this LED ++ # when all internal inputs are off ++ # ++ sysw "-/class/sound/ctl-led/mic/card${CardNumber}/detach:Capture Switch" ++ ] ++ } + True.Define.DeviceMic "Mic2" + } +