Merge ~mschiu77/ubuntu/+source/alsa-ucm-conf:ubuntu/noble-devel into ubuntu/+source/alsa-ucm-conf:ubuntu/devel

[Chris Chiu]

Added patch to fix missing digital speaker on Dell Tarako (LP: #2088403)

[Simon Quigley (tsimonq2)]

Hi, could you please rebase this onto a Noble branch?

review: Needs Resubmitting (git-only, not packaging)

Unmerged commits

2503c3c... by Chris Chiu on 2024-11-15

1.2.10-1ubuntu5.3 (patches unapplied)

Imported using git-ubuntu import.

a72feeb... by Chris Chiu on 2024-11-12

1.2.10-1ubuntu5.2 (patches unapplied)

Imported using git-ubuntu import.

34ff806... by Chris Chiu on 2024-07-02

1.2.10-1ubuntu5.1 (patches unapplied)

Imported using git-ubuntu import.

5d58b19... by Julian Andres Klode on 2024-03-22

1.2.10-1ubuntu5 (patches unapplied)

Imported using git-ubuntu import.

d450035... by Steve Langasek on 2024-03-12

1.2.10-1ubuntu4 (patches unapplied)

Imported using git-ubuntu import.

b9ff197... by ethan.hsieh on 2024-02-20

changelog for 1.2.10-1ubuntu3

b1b9d7c... by ethan.hsieh on 2024-02-20

  * Dropped changes:
    - d/p/0001-Add-initial-support-for-MediaTek-mt8390-evk-and-mt83.patch
      - replace it with patches accepted by upstream
  * Added changes:
    - d/p/0001-ucm2-MediaTek-mt8390-evk-Add-alsa-ucm-support.patch
    - d/p/0002-ucm2-MediaTek-mt8395-evk-Add-alsa-ucm-support.patch
    - d/p/0003-ucm2-MediaTek-mt8370-evk-Add-alsa-ucm-support.patch
    - d/p/0001-ucm2-conf.d-mt8370-evk-Fix-the-type-of-mt8370-evk.co.patch
    - d/p/0001-ucm-MediaTek-mt8395-evk-Add-HDMIRX-config.patch
      - add supports for MediaTek mt8390-evk, mt8395-evk, and mt8370-evk.
      - fix a file type issue on the mt8370-evk config
      - add mt8395 HDMI RX support
        (LP: #2051199)

7988b7d... by Zhaoxuan Zhai on 2024-01-16

1.2.10-1ubuntu2 (patches unapplied)

Imported using git-ubuntu import.

db64b2e... by Christian Ehrhardt on 2023-11-24

changelog: 1.2.10-1ubuntu1 merge and LP: #2042902 fix

Signed-off-by: Christian Ehrhardt <email address hidden>

5239251... by Christian Ehrhardt on 2023-11-24

added headers and background info to d/p/0001-Add-initial-support-for-MediaTek-mt8390-evk-and-mt83.patch

Signed-off-by: Christian Ehrhardt <email address hidden>

diff --git a/debian/changelog b/debian/changelog
index 1c4a2c0..9e3d9e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< debian/changelog
 alsa-ucm-conf (1.2.12-1) unstable; urgency=medium
 
   * New upstream release.
@@ -19,6 +20,109 @@ alsa-ucm-conf (1.2.11-1) unstable; urgency=medium
   * Update copyright years.
 
  -- Jordi Mallach <[e-mail]>  Fri, 01 Mar 2024 11:28:05 +0100
+=======
+alsa-ucm-conf (1.2.10-1ubuntu5.3) noble; urgency=medium
+
+  * Added patch to fix missing digital speaker on Dell Tarako (LP: #2088403)
+    - d/p/0001-sof-soundwire-Add-basic-support-for-cs42l43-s-speake.patch
+
+ -- Chris Chiu <[e-mail]>  Fri, 15 Nov 2024 17:02:01 +0800
+
+alsa-ucm-conf (1.2.10-1ubuntu5.2) noble; urgency=medium
+
+  * Added changes:
+    - d/p/0001-sof-soundwire-fix-rt1318-config-typo-in-rt1318spk-ma.patch
+    - d/p/0002-sof-soundwire-fix-rt1318-config-copy-n-paste-error-i.patch
+    - d/p/0003-sof-soundwire-rt1308-Fix-single-amp-configuration.patch
+    - d/p/0004-sof-soundwire-rt1316-rt1318-fix-channel-selection-fo.patch
+    - d/p/0001-sof-soundwire-Add-missing-match-for-cs42l43-speakers.patch
+    - d/p/0002-sof-soundwire-Add-support-for-cs42l43-cs35l56-bridge.patch
+    - d/p/0001-sof-soundwire-Change-map-control-names-to-make-them-.patch
+    - d/p/0002-sof-soundwire-Add-sequence-for-controlling-Mic-Mute-.patch
+      - Fix the regression on rt13xx which use only one file for speakers
+      - Add missing configuration for CS41L43+CS35L56
+      - Fix control names for speakers/mic on CS42L43+CS35L56
+        (LP: #2069760)
+    - d/p/0001-acppdmmach-add-support-for-ACP-7.0.patch
+      - Backport the support of AMD micmute LED of acppdmmach.
+        (LP: #2085067)
+
+ -- Chris Chiu <[e-mail]>  Tue, 12 Nov 2024 10:26:07 +0800
+
+alsa-ucm-conf (1.2.10-1ubuntu5.1) noble; urgency=medium
+
+  * Added changes:
+    - d/p/0001-sof-soundwire-Use-one-file-for-speaker-codec-initial.patch
+    - d/p/0002-sof-soundwire-Add-basic-support-for-basic-cs35l56-co.patch
+    - d/p/0003-sof-soundwire-Add-basic-support-for-cs42l43.patch
+      - Soundwire support for CS42L43 and CS35L56 on Intel MTL
+        (LP: #2069760)
+
+ -- Chris Chiu <[e-mail]>  Tue, 02 Jul 2024 22:32:17 +0800
+
+alsa-ucm-conf (1.2.10-1ubuntu5) noble; urgency=medium
+
+  * Actual rebuild against libasound2t64; the dependency is hardcoded.
+
+ -- Julian Andres Klode <[e-mail]>  Fri, 22 Mar 2024 17:09:13 +0100
+
+alsa-ucm-conf (1.2.10-1ubuntu4) noble; urgency=medium
+
+  * No-change rebuild against libasound2t64
+
+ -- Steve Langasek <[e-mail]>  Tue, 12 Mar 2024 06:28:57 +0000
+
+alsa-ucm-conf (1.2.10-1ubuntu3) noble; urgency=medium
+
+  * Dropped changes:
+    - d/p/0001-Add-initial-support-for-MediaTek-mt8390-evk-and-mt83.patch
+      - replace it with patches accepted by upstream
+  * Added changes:
+    - d/p/0001-ucm2-MediaTek-mt8390-evk-Add-alsa-ucm-support.patch
+    - d/p/0002-ucm2-MediaTek-mt8395-evk-Add-alsa-ucm-support.patch
+    - d/p/0003-ucm2-MediaTek-mt8370-evk-Add-alsa-ucm-support.patch
+    - d/p/0001-ucm2-conf.d-mt8370-evk-Fix-the-type-of-mt8370-evk.co.patch
+    - d/p/0001-ucm-MediaTek-mt8395-evk-Add-HDMIRX-config.patch
+      - add supports for MediaTek mt8390-evk, mt8395-evk, and mt8370-evk.
+      - fix a file type issue on the mt8370-evk config
+      - add mt8395 HDMI RX support
+        (LP: #2051199)
+
+ -- Ethan Hsieh <[e-mail]>  Thu, 25 Jan 2024 13:29:18 +0800
+
+alsa-ucm-conf (1.2.10-1ubuntu2) noble; urgency=medium
+
+  * d/p/0001-Add-initial-support-for-MediaTek-Genio-boards.patch
+    - fix typo to make the patch work on mtk8390-evk (lp: #2049327)
+
+ -- Zhaoxuan Zhai <[e-mail]>  Tue, 16 Jan 2024 11:23:07 +0100
+
+alsa-ucm-conf (1.2.10-1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/p/0001-Add-initial-support-for-MediaTek-mt8390-evk-and-mt83.patch
+      - add initial support for MediaTek mt8390-evk and mt8395-evk
+        (LP: 2000228)
+  * Dropped changes [all in upstream 1.2.10]:
+    - d/p/0001-ucm2-Qualcomm-sc8280xp-fix-device-numbers.patch
+      - ucm2: Qualcomm: sc8280xp: fix device numbers
+        (LP: 2036731)
+    - 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)
+  * Added changes
+    - added headers and background info to
+      d/p/0001-Add-initial-support-for-MediaTek-mt8390-evk-and-mt83.patch
+
+  [Artur Pak]
+  * d/p/0001-ucm2-soundwire-add-rt713-SDCA-device.patch:
+    - Backport patch to add rt713 SDCA device
+      (LP: #2042902)
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 24 Nov 2023 09:12:05 +0100
+>>>>>>> debian/changelog
 
 alsa-ucm-conf (1.2.10-1) unstable; urgency=medium
 
@@ -26,6 +130,32 @@ alsa-ucm-conf (1.2.10-1) unstable; urgency=medium
 
  -- Jordi Mallach <[e-mail]>  Wed, 13 Sep 2023 01:12:05 +0200
 
+alsa-ucm-conf (1.2.9-1ubuntu3) mantic; urgency=medium
+
+  * d/p/0001-ucm2-Qualcomm-sc8280xp-fix-device-numbers.patch
+    - ucm2: Qualcomm: sc8280xp: fix device numbers
+      (LP: #2036731)
+
+ -- Juerg Haefliger <[e-mail]>  Wed, 20 Sep 2023 13:37:38 +0200
+
+alsa-ucm-conf (1.2.9-1ubuntu2) mantic; urgency=medium
+
+  * d/p/0001-Add-initial-support-for-MediaTek-mt8390-evk-and-mt83.patch
+    - add initial support for MediaTek mt8390-evk and mt8395-evk
+      (LP: #2000228)
+
+ -- Ethan Hsieh <[e-mail]>  Mon, 18 Sep 2023 16:13:56 +0800
+
+alsa-ucm-conf (1.2.9-1ubuntu1) mantic; 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)
+
+ -- Juerg Haefliger <[e-mail]>  Thu, 06 Jul 2023 15:29:27 +0200
+
 alsa-ucm-conf (1.2.9-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 6e789bd..570ed57 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: alsa-ucm-conf
 Section: libs
 Priority: optional
-Maintainer: Debian ALSA Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian ALSA Maintainers <[e-mail]>
 Uploaders: Jordi Mallach <[e-mail]>,
            Elimar Riesebieter <[e-mail]>,
            Luke Yelavich <[e-mail]>
@@ -15,7 +16,11 @@ Rules-Requires-Root: no
 Package: alsa-ucm-conf
 Architecture: all
 Multi-Arch: foreign
+<<<<<<< debian/control
 Depends: ${misc:Depends}, libasound2t64
+=======
+Depends: ${misc:Depends}, libasound2t64 (>= 1.2.7)
+>>>>>>> debian/control
 Description: ALSA Use Case Manager configuration files
  This package contains ALSA Use Case Manager configuration of audio
  input/output names and routing for specific audio hardware. They can be
diff --git a/debian/patches/0001-acppdmmach-add-support-for-ACP-7.0.patch b/debian/patches/0001-acppdmmach-add-support-for-ACP-7.0.patch
new file mode 100644
index 0000000..049497f
--- /dev/null
+++ b/debian/patches/0001-acppdmmach-add-support-for-ACP-7.0.patch
@@ -0,0 +1,37 @@
+From b2358f24a93d5a07b5bf7c35f0d76676dc85869c Mon Sep 17 00:00:00 2001
+From: Mario Limonciello <[e-mail]>
+Date: Thu, 17 Oct 2024 11:44:20 -0500
+Subject: [PATCH] acppdmmach: add support for ACP 7.0
+
+Starting with ACP 7.0 there is a generic 'acppdmmach' driver that
+will be utilized.
+
+Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/452
+Signed-off-by: Mario Limonciello <[e-mail]>
+Signed-off-by: Jaroslav Kysela <[e-mail]>
+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commit/b2358f24a93d5a07b5bf7c35f0d76676dc85869c
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2085067
+Signed-off-by: Aaron Ma <[e-mail]>
+---
+ ucm2/HDA/HDA.conf                          | 2 +-
+ ucm2/conf.d/acp-pdm-mach/acp-pdm-mach.conf | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 120000 ucm2/conf.d/acp-pdm-mach/acp-pdm-mach.conf
+
+--- a/ucm2/HDA/HDA.conf
++++ b/ucm2/HDA/HDA.conf
+@@ -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
+ 
+-Define.AcpCardId "$${find-card:field=name,return=id,regex='^acp(|6[23x])$'}"
++Define.AcpCardId "$${find-card:field=name,return=id,regex='^acp(|6[23x]|-pdm-mach)$'}"
+ Define.DeviceMic "Mic"
+ 
+ If.dualcodec {
+--- /dev/null
++++ b/ucm2/conf.d/acp-pdm-mach/acp-pdm-mach.conf
+@@ -0,0 +1,3 @@
++Syntax 3
++
++Include.linked.File "/common/linked.conf"
diff --git a/debian/patches/0001-sof-soundwire-Add-basic-support-for-cs42l43-s-speake.patch b/debian/patches/0001-sof-soundwire-Add-basic-support-for-cs42l43-s-speake.patch
new file mode 100644
index 0000000..bbbbe4c
--- /dev/null
+++ b/debian/patches/0001-sof-soundwire-Add-basic-support-for-cs42l43-s-speake.patch
@@ -0,0 +1,46 @@
+From: Charles Keepax <[e-mail]>
+Date: Tue, 23 Apr 2024 16:43:05 +0100
+Subject: [PATCH] sof-soundwire: Add basic support for cs42l43's speaker
+
+Previous support was added for the mics and headset on cs42l43, expand
+this support with additional configuration for the speaker output.
+
+Link: https://lore.kernel.org/alsa-devel/[e-mail]/
+Signed-off-by: Charles Keepax <[e-mail]>
+Signed-off-by: Jaroslav Kysela <[e-mail]>
+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commit/035d9206cffdf7942352d2daf3c34dde491c01dc.patch
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2088403
+Signed-off-by: Chris Chiu <[e-mail]>
+---
+ ucm2/sof-soundwire/cs42l43-spk.conf | 25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)
+ create mode 100644 ucm2/sof-soundwire/cs42l43-spk.conf
+
+--- /dev/null
++++ b/ucm2/sof-soundwire/cs42l43-spk.conf
+@@ -0,0 +1,25 @@
++# Use case Configuration for sof-soundwire card
++
++SectionDevice."Speaker" {
++	Comment "Speaker"
++
++	ConflictingDevice [
++		"Headphones"
++	]
++
++	EnableSequence [
++		cset "name='cs42l43 Speaker L Input 1' 'DP5RX1'"
++		cset "name='cs42l43 Speaker R Input 1' 'DP5RX2'"
++	]
++
++	DisableSequence [
++		cset "name='cs42l43 Speaker L Input 1' 'None'"
++		cset "name='cs42l43 Speaker R Input 1' 'None'"
++	]
++
++	Value {
++		PlaybackPriority 100
++		PlaybackPCM "hw:${CardId},0"
++		PlaybackMixerElem "cs42l43 Speaker Digital"
++	}
++}
diff --git a/debian/patches/0001-sof-soundwire-Add-missing-match-for-cs42l43-speakers.patch b/debian/patches/0001-sof-soundwire-Add-missing-match-for-cs42l43-speakers.patch
new file mode 100644
index 0000000..ebfe89a
--- /dev/null
+++ b/debian/patches/0001-sof-soundwire-Add-missing-match-for-cs42l43-speakers.patch
@@ -0,0 +1,28 @@
+From: Charles Keepax <[e-mail]>
+Date: Mon, 8 Jul 2024 12:59:18 +0100
+Subject: sof-soundwire: Add missing match for cs42l43 speakers
+
+The cs42l43 reports as cs42l43-spk in the speaker case, the regex in
+sof-soundwire needs updated to recognise that.
+
+Fixes: 035d9206cffd ("sof-soundwire: Add basic support for cs42l43's speaker")
+Signed-off-by: Charles Keepax <[e-mail]>
+Signed-off-by: Jaroslav Kysela <[e-mail]>
+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commits/d8aea84bebaae416c530a2d448f5e3758809c09f
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2069760
+Signed-off-by: Chris Chiu <[e-mail]>
+---
+ ucm2/sof-soundwire/sof-soundwire.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/ucm2/sof-soundwire/sof-soundwire.conf
++++ b/ucm2/sof-soundwire/sof-soundwire.conf
+@@ -19,7 +19,7 @@
+ 
+ DefineRegex {
+ 	SpeakerCodec {
+-		Regex " spk:([a-z0-9]+(-sdca)?)"
++		Regex " spk:([a-z0-9]+((-sdca)|(-spk))?)"
+ 		String "${CardComponents}"
+ 	}
+ 	SpeakerChannels {
diff --git a/debian/patches/0001-sof-soundwire-Change-map-control-names-to-make-them-.patch b/debian/patches/0001-sof-soundwire-Change-map-control-names-to-make-them-.patch
new file mode 100644
index 0000000..7b89176
--- /dev/null
+++ b/debian/patches/0001-sof-soundwire-Change-map-control-names-to-make-them-.patch
@@ -0,0 +1,93 @@
+From: Maciej Strozek <[e-mail]>
+Date: Thu, 17 Oct 2024 13:20:26 +0100
+Subject: sof-soundwire: Change map control names to make them unique and user
+ friendly
+
+Both 'Speaker Digital' and 'cs42l43 PDM2' names were found in other alsa
+controls, confusing the MixerElems paths. Make them unique to avoid errors for
+hardware mutes. Also add 'Capture' string into microphone controls to make
+them work properly.
+
+Link: https://lore.kernel.org/alsa-devel/[e-mail]/
+Signed-off-by: Maciej Strozek <[e-mail]>
+Signed-off-by: Jaroslav Kysela <[e-mail]>
+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commits/9864d624b27e3779d958138561e48f59287a124a
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2069760
+Signed-off-by: Chris Chiu <[e-mail]>
+---
+ ucm2/codecs/cs42l43/init.conf          | 10 ++++++++--
+ ucm2/sof-soundwire/cs35l56-bridge.conf |  6 +++---
+ ucm2/sof-soundwire/cs42l43-dmic.conf   |  2 +-
+ ucm2/sof-soundwire/cs42l43.conf        |  3 ++-
+ 4 files changed, 14 insertions(+), 7 deletions(-)
+
+--- a/ucm2/codecs/cs42l43/init.conf
++++ b/ucm2/codecs/cs42l43/init.conf
+@@ -2,13 +2,19 @@
+ 
+ LibraryConfig.remap.Config {
+ 	ctl.default.map {
+-		"name='cs42l43 PDM2 Switch'" {
++		"name='cs42l43 Microphone Capture Switch'" {
+ 			"name='cs42l43 Decimator 3 Switch'".vindex.0 0
+ 			"name='cs42l43 Decimator 4 Switch'".vindex.1 0
+ 		}
+-		"name='cs42l43 PDM2 Volume'" {
++		"name='cs42l43 Microphone Capture Volume'" {
+ 			"name='cs42l43 Decimator 3 Volume'".vindex.0 0
+ 			"name='cs42l43 Decimator 4 Volume'".vindex.1 0
+ 		}
++		"name='cs42l43 Headset Microphone Capture Switch'" {
++			"name='cs42l43 Decimator 1 Switch'".vindex.0 0
++		}
++		"name='cs42l43 Headset Microphone Capture Volume'" {
++			"name='cs42l43 Decimator 1 Volume'".vindex.0 0
++		}
+ 	}
+ }
+--- a/ucm2/sof-soundwire/cs35l56-bridge.conf
++++ b/ucm2/sof-soundwire/cs35l56-bridge.conf
+@@ -2,11 +2,11 @@
+ 
+ LibraryConfig.remap.Config {
+ 	ctl.default.map {
+-		"name='Speaker Digital Switch'" {
++		"name='Speaker Playback Switch'" {
+ 			"name='AMPL Speaker Switch'".vindex.0 0
+ 			"name='AMPR Speaker Switch'".vindex.1 0
+ 		}
+-		"name='Speaker Digital Volume'" {
++		"name='Speaker Playback Volume'" {
+ 			"name='AMPL Speaker Volume'".vindex.0 0
+ 			"name='AMPR Speaker Volume'".vindex.1 0
+ 		}
+@@ -56,6 +56,6 @@
+ 		PlaybackPriority 100
+ 		PlaybackPCM "hw:${CardId},0"
+ 		PlaybackMixer "default:${CardId}"
+-		PlaybackMixerElem "Speaker Digital"
++		PlaybackMixerElem "Speaker"
+ 	}
+ }
+--- a/ucm2/sof-soundwire/cs42l43-dmic.conf
++++ b/ucm2/sof-soundwire/cs42l43-dmic.conf
+@@ -21,6 +21,6 @@
+ 		CapturePriority 100
+ 		CapturePCM "hw:${CardId},4"
+ 		CaptureMixer "default:${CardId}"
+-		CaptureMixerElem "cs42l43 PDM2"
++		CaptureMixerElem "cs42l43 Microphone"
+ 	}
+ }
+--- a/ucm2/sof-soundwire/cs42l43.conf
++++ b/ucm2/sof-soundwire/cs42l43.conf
+@@ -40,7 +40,8 @@
+ 	Value {
+ 		CapturePriority 200
+ 		CapturePCM "hw:${CardId},4"
+-		CaptureMixerElem "cs42l43 Decimator 1"
++		CaptureMixer "default:${CardId}"
++		CaptureMixerElem "cs42l43 Headset Microphone"
+ 		JackControl "Headset Mic Jack"
+ 	}
+ }
diff --git a/debian/patches/0001-sof-soundwire-Use-one-file-for-speaker-codec-initial.patch b/debian/patches/0001-sof-soundwire-Use-one-file-for-speaker-codec-initial.patch
new file mode 100644
index 0000000..f37f067
--- /dev/null
+++ b/debian/patches/0001-sof-soundwire-Use-one-file-for-speaker-codec-initial.patch
@@ -0,0 +1,415 @@
+From: Jaroslav Kysela <[e-mail]>
+Date: Wed, 6 Dec 2023 15:53:38 +0100
+Subject: [PATCH 1/3] sof-soundwire: Use one file for speaker codec
+ initialization
+
+Use macros to minimize configuration blocks.
+
+Signed-off-by: Jaroslav Kysela <[e-mail]>
+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commit/c0a4df6037860b4e1dffb497e5a28258a351a0f8
+Bug: https://github.com/alsa-project/alsa-ucm-conf/pull/370
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2069760
+Signed-off-by: Chris Chiu <[e-mail]>
+---
+ ucm2/sof-soundwire/HiFi.conf     |  2 +-
+ ucm2/sof-soundwire/rt1308-1.conf | 22 --------------
+ ucm2/sof-soundwire/rt1308-2.conf | 29 ------------------
+ ucm2/sof-soundwire/rt1308.conf   | 46 ++++++++++++++++++++++++++++
+ ucm2/sof-soundwire/rt1316-1.conf | 41 -------------------------
+ ucm2/sof-soundwire/rt1316-2.conf | 51 -------------------------------
+ ucm2/sof-soundwire/rt1316.conf   | 65 ++++++++++++++++++++++++++++++++++++++++
+ ucm2/sof-soundwire/rt1318-1.conf | 20 -------------
+ ucm2/sof-soundwire/rt1318-2.conf | 25 ----------------
+ ucm2/sof-soundwire/rt1318.conf   | 44 +++++++++++++++++++++++++++
+ 10 files changed, 156 insertions(+), 189 deletions(-)
+ delete mode 100644 ucm2/sof-soundwire/rt1308-1.conf
+ delete mode 100644 ucm2/sof-soundwire/rt1308-2.conf
+ create mode 100644 ucm2/sof-soundwire/rt1308.conf
+ delete mode 100644 ucm2/sof-soundwire/rt1316-1.conf
+ delete mode 100644 ucm2/sof-soundwire/rt1316-2.conf
+ create mode 100644 ucm2/sof-soundwire/rt1316.conf
+ delete mode 100644 ucm2/sof-soundwire/rt1318-1.conf
+ delete mode 100644 ucm2/sof-soundwire/rt1318-2.conf
+ create mode 100644 ucm2/sof-soundwire/rt1318.conf
+
+--- a/ucm2/sof-soundwire/HiFi.conf
++++ b/ucm2/sof-soundwire/HiFi.conf
+@@ -13,7 +13,7 @@
+ 		Type String
+ 		Empty "${var:SpeakerCodec1}"
+ 	}
+-	False.Include.spkdev.File "/sof-soundwire/${var:SpeakerCodec1}-${var:SpeakerAmps1}.conf"
++	False.Include.spkdev.File "/sof-soundwire/${var:SpeakerCodec1}.conf"
+ }
+ 
+ If.micdev {
+--- a/ucm2/sof-soundwire/rt1308-1.conf
++++ /dev/null
+@@ -1,22 +0,0 @@
+-# Use case Configuration for sof-soundwire card
+-
+-SectionDevice."Speaker" {
+-	Comment	"Speaker"
+-
+-	EnableSequence [
+-		cset "name='rt1308-1 DAC L Switch' 1"
+-		cset "name='rt1308-1 DAC R Switch' 1"
+-		cset "name='Speaker Switch' on"
+-	]
+-
+-	DisableSequence [
+-		cset "name='rt1308-1 DAC L Switch' 0"
+-		cset "name='rt1308-1 DAC R Switch' 0"
+-		cset "name='Speaker Switch' off"
+-	]
+-
+-	Value {
+-	      PlaybackPriority 100
+-	      PlaybackPCM "hw:${CardId},2"
+-	}
+-}
+--- a/ucm2/sof-soundwire/rt1308-2.conf
++++ /dev/null
+@@ -1,29 +0,0 @@
+-# Use case Configuration for sof-soundwire card
+-
+-SectionDevice."Speaker" {
+-	Comment	"Speaker"
+-
+-	EnableSequence [
+-		cset "name='rt1308-1 RX Channel Select' LL"
+-		cset "name='rt1308-2 RX Channel Select' RR"
+-
+-		cset "name='rt1308-1 DAC L Switch' 1"
+-		cset "name='rt1308-1 DAC R Switch' 1"
+-		cset "name='rt1308-2 DAC L Switch' 1"
+-		cset "name='rt1308-2 DAC R Switch' 1"
+-		cset "name='Speaker Switch' on"
+-	]
+-
+-	DisableSequence [
+-		cset "name='rt1308-1 DAC L Switch' 0"
+-		cset "name='rt1308-1 DAC R Switch' 0"
+-		cset "name='rt1308-2 DAC L Switch' 0"
+-		cset "name='rt1308-2 DAC R Switch' 0"
+-		cset "name='Speaker Switch' off"
+-	]
+-
+-	Value {
+-	      PlaybackPriority 100
+-	      PlaybackPCM "hw:${CardId},2"
+-	}
+-}
+--- /dev/null
++++ b/ucm2/sof-soundwire/rt1308.conf
+@@ -0,0 +1,46 @@
++# Use case Configuration for sof-soundwire card
++
++#
++# Arguments:
++#   ForAmps - regex filter for var:SpeakerAmps
++#   Amp - amplifier number (1,2 etc.)
++#   Sel - channel selection (LR LL RL RR)
++#
++DefineMacro.rt1308spk.If.0 {
++	Condition {
++		Type RegexMatch
++		Regex "${var:__ForAmps}"
++		String "${var:SpeakerAmps}"
++	}
++	True {
++		EnableSequence [
++			cset "name='rt1308-${var:__Amp} RX Channel Select' ${var:__Sel}"
++			cset "name='rt1308-${var:__Amp} DAC L Switch' 1"
++			cset "name='rt1308-${var:__Amp} DAC R Switch' 1"
++		]
++		DisableSequence [
++			cset "name='rt1308-${var:__Amp} DAC L Switch' 0"
++			cset "name='rt1308-${var:__Amp} DAC R Switch' 0"
++		]
++	}
++}
++
++SectionDevice."Speaker" {
++	Comment	"Speaker"
++
++	Macro.num1.rt1308spk { ForAmps "[12]" Amp 1 Sel LL }
++	Macro.num2.rt1308spk { ForAmps "2" Amp 2 Sel RR }
++
++	EnableSequence [
++		cset "name='Speaker Switch' on"
++	]
++
++	DisableSequence [
++		cset "name='Speaker Switch' off"
++	]
++
++	Value {
++	      PlaybackPriority 100
++	      PlaybackPCM "hw:${CardId},2"
++	}
++}
+--- a/ucm2/sof-soundwire/rt1316-1.conf
++++ /dev/null
+@@ -1,41 +0,0 @@
+-# Use case Configuration for sof-soundwire card
+-
+-SectionDevice."Speaker" {
+-	Comment	"Speaker"
+-
+-	If.lrswitch {
+-		Condition {
+-			Type ControlExists
+-			Control "name='rt1316-1 DAC L Switch'"
+-		}
+-		True {
+-			EnableSequence [
+-				cset "name='rt1316-1 DAC L Switch' 1"
+-				cset "name='rt1316-1 DAC R Switch' 1"
+-				cset "name='Speaker Switch' on"
+-			]
+-
+-			DisableSequence [
+-				cset "name='rt1316-1 DAC L Switch' 0"
+-				cset "name='rt1316-1 DAC R Switch' 0"
+-				cset "name='Speaker Switch' off"
+-			]
+-		}
+-		False {
+-			EnableSequence [
+-				cset "name='rt1316-1 DAC Switch' 1"
+-				cset "name='Speaker Switch' on"
+-			]
+-
+-			DisableSequence [
+-				cset "name='rt1316-1 DAC Switch' 0"
+-				cset "name='Speaker Switch' off"
+-			]
+-		}
+-	}
+-
+-	Value {
+-	      PlaybackPriority 100
+-	      PlaybackPCM "hw:${CardId},2"
+-	}
+-}
+--- a/ucm2/sof-soundwire/rt1316-2.conf
++++ /dev/null
+@@ -1,51 +0,0 @@
+-# Use case Configuration for sof-soundwire card
+-
+-SectionDevice."Speaker" {
+-	Comment	"Speaker"
+-
+-	If.lrswitch {
+-		Condition {
+-			Type ControlExists
+-			Control "name='rt1316-1 DAC L Switch'"
+-		}
+-		True {
+-			EnableSequence [
+-				cset "name='rt1316-1 RX Channel Select' L,L"
+-				cset "name='rt1316-2 RX Channel Select' R,R"
+-				cset "name='rt1316-1 DAC L Switch' 1"
+-				cset "name='rt1316-1 DAC R Switch' 1"
+-				cset "name='rt1316-2 DAC L Switch' 1"
+-				cset "name='rt1316-2 DAC R Switch' 1"
+-				cset "name='Speaker Switch' on"
+-			]
+-
+-			DisableSequence [
+-				cset "name='rt1316-1 DAC L Switch' 0"
+-				cset "name='rt1316-1 DAC R Switch' 0"
+-				cset "name='rt1316-2 DAC L Switch' 0"
+-				cset "name='rt1316-2 DAC R Switch' 0"
+-				cset "name='Speaker Switch' off"
+-			]
+-		}
+-		False {
+-			EnableSequence [
+-				cset "name='rt1316-1 RX Channel Select' L,L"
+-				cset "name='rt1316-2 RX Channel Select' R,R"
+-				cset "name='rt1316-1 DAC Switch' 1"
+-				cset "name='rt1316-2 DAC Switch' 1"
+-				cset "name='Speaker Switch' on"
+-			]
+-
+-			DisableSequence [
+-				cset "name='rt1316-1 DAC Switch' 0"
+-				cset "name='rt1316-2 DAC Switch' 0"
+-				cset "name='Speaker Switch' off"
+-			]
+-		}
+-	}
+-
+-	Value {
+-	      PlaybackPriority 100
+-	      PlaybackPCM "hw:${CardId},2"
+-	}
+-}
+--- /dev/null
++++ b/ucm2/sof-soundwire/rt1316.conf
+@@ -0,0 +1,65 @@
++# Use case Configuration for sof-soundwire card
++
++#
++# Arguments:
++#   ForAmps - regex filter for var:SpeakerAmps
++#   Amp - amplifier number (1,2 etc.)
++#   Sel - channel selection (L,R L,L L,R L,L+R R,L R,R R,L+R L+R,L L+R,R L+R,L+R)
++#
++DefineMacro.rt1316spk.If.0 {
++	Condition {
++		Type RegexMatch
++		Regex "${var:__ForAmps}"
++		String "${var:SpeakerAmps}"
++	}
++	True {
++		EnableSequence [
++			cset "name='rt1316-${var:__Amp} RX Channel Select' ${var:__Sel}"
++		]
++		If.lrswitch {
++			Condition {
++				Type ControlExists
++				Control "name='rt1316-${var:__Amp} DAC L Switch'"
++			}
++			True {
++				EnableSequence [
++					cset "name='rt1316-${var:__Amp} DAC L Switch' 1"
++					cset "name='rt1316-${var:__Amp} DAC R Switch' 1"
++				]
++				DisableSequence [
++					cset "name='rt1316-${var:__Amp} DAC L Switch' 0"
++					cset "name='rt1316-${var:__Amp} DAC R Switch' 0"
++				]
++			}
++			False {
++				EnableSequence [
++					cset "name='rt1316-${var:__Amp} DAC Switch' 1"
++				]
++
++				DisableSequence [
++					cset "name='rt1316-${var:__Amp} DAC Switch' 0"
++				]
++			}
++		}
++	}
++}
++
++SectionDevice."Speaker" {
++	Comment	"Speaker"
++
++	Macro.num1.rt1316spk { ForAmps "[12]" Amp 1 Sel "L,L" }
++	Macro.num2.rt1316spk { ForAmps "2" Amp 2 Sel "R,R" }
++
++	EnableSequence [
++		cset "name='Speaker Switch' on"
++	]
++
++	DisableSequence [
++		cset "name='Speaker Switch' off"
++	]
++
++	Value {
++	      PlaybackPriority 100
++	      PlaybackPCM "hw:${CardId},2"
++	}
++}
+--- a/ucm2/sof-soundwire/rt1318-1.conf
++++ /dev/null
+@@ -1,20 +0,0 @@
+-# 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"
+-	}
+-}
+--- a/ucm2/sof-soundwire/rt1318-2.conf
++++ /dev/null
+@@ -1,25 +0,0 @@
+-# 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"
+-	}
+-}
+--- /dev/null
++++ b/ucm2/sof-soundwire/rt1318.conf
+@@ -0,0 +1,44 @@
++# Use case Configuration for sof-soundwire card
++
++#
++# Arguments:
++#   ForAmps - regex filter for var:SpeakerAmps
++#   Amp - amplifier number (1,2 etc.)
++#   Sel - channel selection (L,R L,L L,R L,L+R R,L R,R R,L+R L+R,L L+R,R L+R,L+R)
++#
++DefineMacro.rt1318spk.If.0 {
++	Condition {
++		Type RegexMatch
++		Regex "${var:__RegEx}"
++		String "${var:SpeakerAmps}"
++	}
++	True {
++		EnableSequence [
++			cset "name='rt1308-${var:__Amp} RX Channel Select' ${var:__Sel}"
++			cset "name='rt1308-${var:__Amp} DAC Switch' 1"
++		]
++		DisableSequence [
++			cset "name='rt1308-${var:__Amp} DAC Switch' 0"
++		]
++	}
++}
++
++SectionDevice."Speaker" {
++	Comment	"Speaker"
++
++	Macro.num1.rt1318spk { ForAmps "[12]" Amp 1 Sel "L,L" }
++	Macro.num2.rt1318spk { ForAmps "2" Amp 2 Sel "R,R" }
++
++	EnableSequence [
++		cset "name='Speaker Switch' on"
++	]
++
++	DisableSequence [
++		cset "name='Speaker Switch' off"
++	]
++
++	Value {
++	      PlaybackPriority 100
++	      PlaybackPCM "hw:${CardId},2"
++	}
++}
diff --git a/debian/patches/0001-sof-soundwire-fix-rt1318-config-typo-in-rt1318spk-ma.patch b/debian/patches/0001-sof-soundwire-fix-rt1318-config-typo-in-rt1318spk-ma.patch
new file mode 100644
index 0000000..1c60872
--- /dev/null
+++ b/debian/patches/0001-sof-soundwire-fix-rt1318-config-typo-in-rt1318spk-ma.patch
@@ -0,0 +1,23 @@
+From: Jaroslav Kysela <[e-mail]>
+Date: Mon, 11 Mar 2024 11:06:15 +0100
+Subject: sof-soundwire: fix rt1318 config typo in rt1318spk macro
+
+Signed-off-by: Jaroslav Kysela <[e-mail]>
+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commit/7e22b7c214d346bd156131f3e6c6a5900bbf116d
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2069760
+Signed-off-by: Chris Chiu <[e-mail]>
+---
+ ucm2/sof-soundwire/rt1318.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/ucm2/sof-soundwire/rt1318.conf
++++ b/ucm2/sof-soundwire/rt1318.conf
+@@ -9,7 +9,7 @@
+ DefineMacro.rt1318spk.If.0 {
+ 	Condition {
+ 		Type RegexMatch
+-		Regex "${var:__RegEx}"
++		Regex "${var:__ForAmps}"
+ 		String "${var:SpeakerAmps}"
+ 	}
+ 	True {
diff --git a/debian/patches/0001-ucm-MediaTek-mt8395-evk-Add-HDMIRX-config.patch b/debian/patches/0001-ucm-MediaTek-mt8395-evk-Add-HDMIRX-config.patch
new file mode 100644
index 0000000..1ec9814
--- /dev/null
+++ b/debian/patches/0001-ucm-MediaTek-mt8395-evk-Add-HDMIRX-config.patch
@@ -0,0 +1,78 @@
+From 1ab2d020d71a570f691fafbd341782fabb6569d1 Mon Sep 17 00:00:00 2001
+From: Zoran Zhan <[e-mail]>
+Date: Mon, 22 Jan 2024 17:52:05 +0800
+Subject: [PATCH] ucm: MediaTek: mt8395-evk: Add HDMIRX config
+
+Add HDMI RX config and modify the priority value
+of the capture devices.
+
+Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/389
+Signed-off-by: Zoran Zhan <[e-mail]>
+Signed-off-by: Jaroslav Kysela <[e-mail]>
+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commit/1ab2d020d71a570f691fafbd341782fabb6569d1
+Bug: https://bugs.launchpad.net/ubuntu/+source/alsa-ucm-conf/+bug/2051199
+---
+ ucm2/MediaTek/mt8395-evk/HiFi.conf       | 15 ++++++++++++---
+ ucm2/MediaTek/mt8395-evk/mt8395-evk.conf |  1 +
+ 2 files changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/ucm2/MediaTek/mt8395-evk/HiFi.conf b/ucm2/MediaTek/mt8395-evk/HiFi.conf
+index 81e4423..5c25cfb 100644
+--- a/ucm2/MediaTek/mt8395-evk/HiFi.conf
++++ b/ucm2/MediaTek/mt8395-evk/HiFi.conf
+@@ -34,6 +34,15 @@ SectionDevice."HDMI2" {
+ 	]
+ }
+ 
++SectionDevice."HDMI3" {
++	Comment "HDMI RX"
++
++	Value {
++		CapturePriority 200
++		CapturePCM "hw:${CardId},7"
++	}
++}
++
+ SectionDevice."Speaker" {
+ 	Comment "Lineout speaker"
+ 
+@@ -90,7 +99,7 @@ SectionDevice."Headset" {
+ 	]
+ 
+ 	Value {
+-		CapturePriority 400
++		CapturePriority 500
+ 		CaptureChannels 3
+ 		CapturePCM "hw:${CardId},15"
+ 	}
+@@ -117,7 +126,7 @@ SectionDevice."Mic1" {
+ 	]
+ 
+ 	Value {
+-		CapturePriority 300
++		CapturePriority 400
+ 		CaptureChannels 3
+ 		CapturePCM "hw:${CardId},15"
+ 	}
+@@ -127,7 +136,7 @@ SectionDevice."Mic2" {
+ 	Comment "Digital microphone"
+ 
+ 	Value {
+-		CapturePriority 200
++		CapturePriority 300
+ 		CaptureChannels 2
+ 		CapturePCM "hw:${CardId},14"
+ 	}
+diff --git a/ucm2/MediaTek/mt8395-evk/mt8395-evk.conf b/ucm2/MediaTek/mt8395-evk/mt8395-evk.conf
+index 1957b69..b739ec0 100644
+--- a/ucm2/MediaTek/mt8395-evk/mt8395-evk.conf
++++ b/ucm2/MediaTek/mt8395-evk/mt8395-evk.conf
+@@ -18,6 +18,7 @@ BootSequence [
+ 	cset "name='PGA_3_Mux' AIN3"
+ 	cset "name='HDMI_OUT_MUX' Connect"
+ 	cset "name='DPTX_OUT_MUX' Disconnect"
++	cset "name='MULTI_IN1_MUX' HDMI_RX_I2S"
+ 	cset "name='Lineout Volume' 10"
+ 	cset "name='Headset Volume' 2"
+ 	cset "name='PGA1 Volume' 4"
+-- 
diff --git a/debian/patches/0001-ucm2-MediaTek-mt8390-evk-Add-alsa-ucm-support.patch b/debian/patches/0001-ucm2-MediaTek-mt8390-evk-Add-alsa-ucm-support.patch
new file mode 100644
index 0000000..2245480
--- /dev/null
+++ b/debian/patches/0001-ucm2-MediaTek-mt8390-evk-Add-alsa-ucm-support.patch
@@ -0,0 +1,254 @@
+From c5366bdff656092241225d2ad663c3e41b146f8b Mon Sep 17 00:00:00 2001
+From: Zoran Zhan <[e-mail]>
+Date: Thu, 1 Jun 2023 15:37:14 +0800
+Subject: [PATCH 1/3] ucm2: MediaTek: mt8390-evk: Add alsa-ucm support
+
+Add alsa-ucm support for the MediaTek mt8390-evk platform.
+
+Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/321
+Signed-off-by: Zoran Zhan <[e-mail]>
+Signed-off-by: Jaroslav Kysela <[e-mail]>
+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commit/c5366bdff656092241225d2ad663c3e41b146f8b
+Bug: https://bugs.launchpad.net/ubuntu/+source/alsa-ucm-conf/+bug/2051199
+---
+ ucm2/MediaTek/mt8390-evk/HiFi.conf       | 165 +++++++++++++++++++++++
+ ucm2/MediaTek/mt8390-evk/mt8390-evk.conf |  45 +++++++
+ ucm2/conf.d/mt8390-evk/mt8390-evk.conf   |   1 +
+ 3 files changed, 211 insertions(+)
+ create mode 100644 ucm2/MediaTek/mt8390-evk/HiFi.conf
+ create mode 100644 ucm2/MediaTek/mt8390-evk/mt8390-evk.conf
+ create mode 120000 ucm2/conf.d/mt8390-evk/mt8390-evk.conf
+
+diff --git a/ucm2/MediaTek/mt8390-evk/HiFi.conf b/ucm2/MediaTek/mt8390-evk/HiFi.conf
+new file mode 100644
+index 0000000..42a4582
+--- /dev/null
++++ b/ucm2/MediaTek/mt8390-evk/HiFi.conf
+@@ -0,0 +1,165 @@
++SectionDevice."HDMI1" {
++	Comment "HDMI output"
++
++	Value {
++		PlaybackPriority 300
++		PlaybackPCM "hw:${CardId},5"
++		JackControl "HDMI Jack"
++	}
++
++	EnableSequence [
++		cset "name='HDMI_OUT_MUX' 1"
++	]
++
++	DisableSequence [
++		cset "name='HDMI_OUT_MUX' 0"
++	]
++}
++
++SectionDevice."HDMI2" {
++	Comment "DP output"
++
++	Value {
++		PlaybackPriority 300
++		PlaybackPCM "hw:${CardId},5"
++		JackControl "DP Jack"
++	}
++
++	EnableSequence [
++		cset "name='DPTX_OUT_MUX' 1"
++	]
++
++	DisableSequence [
++		cset "name='DPTX_OUT_MUX' 0"
++	]
++}
++
++SectionDevice."Speaker" {
++	Comment "Lineout speaker"
++
++	ConflictingDevice [
++		"Headphones"
++	]
++
++	EnableSequence [
++		cset "name='LOL Mux' Playback_L_DAC"
++	]
++
++	DisableSequence [
++		cset "name='LOL Mux' Open"
++	]
++
++	Value {
++		PlaybackPriority 400
++		PlaybackChannels 2
++		PlaybackPCM "hw:${CardId},0"
++	}
++}
++
++SectionDevice."Headphones" {
++	Comment "Earphone speaker"
++
++	ConflictingDevice [
++		"Speaker"
++	]
++
++	EnableSequence [
++		cset "name='HP Mux' Audio Playback"
++	]
++
++	DisableSequence [
++		cset "name='HP Mux' Open"
++	]
++
++	Value {
++		PlaybackPriority 500
++		PlaybackChannels 2
++		PlaybackPCM "hw:${CardId},0"
++	}
++}
++
++SectionDevice."Headset" {
++	Comment "Earphone microphone"
++
++	ConflictingDevice [
++		"Mic1"
++	]
++
++	EnableSequence [
++		cset "name='PGA_L_Mux' AIN1"
++	]
++
++	Value {
++		CapturePriority 500
++		CaptureChannels 1
++		CapturePCM "hw:${CardId},10"
++	}
++}
++
++SectionDevice."Mic1" {
++	Comment "Analog microphone"
++
++	ConflictingDevice [
++		"Headset"
++	]
++
++	EnableSequence [
++		cset "name='PGA_L_Mux' AIN0"
++	]
++
++	Value {
++		CapturePriority 400
++		CaptureChannels 1
++		CapturePCM "hw:${CardId},10"
++	}
++}
++
++SectionDevice."Mic2" {
++	Comment "Digital microphone"
++
++	Value {
++		CapturePriority 300
++		CaptureChannels 2
++		CapturePCM "hw:${CardId},14"
++	}
++}
++
++SectionDevice."Line1" {
++	Comment "PCM input"
++
++	Value {
++		CapturePriority 200
++		CaptureChannels 2
++		CapturePCM "hw:${CardId},8"
++	}
++}
++
++SectionDevice."Line2" {
++	Comment "PCM output"
++
++	Value {
++		PlaybackPriority 200
++		PlaybackChannels 2
++		PlaybackPCM "hw:${CardId},2"
++	}
++}
++
++SectionDevice."Line3" {
++	Comment "I2S input"
++
++	Value {
++		CapturePriority 100
++		CaptureChannels 2
++		CapturePCM "hw:${CardId},11"
++	}
++}
++
++SectionDevice."Line4" {
++	Comment "I2S output"
++
++	Value {
++		PlaybackPriority 100
++		PlaybackChannels 8
++		PlaybackPCM "hw:${CardId},6"
++	}
++}
+\ No newline at end of file
+diff --git a/ucm2/MediaTek/mt8390-evk/mt8390-evk.conf b/ucm2/MediaTek/mt8390-evk/mt8390-evk.conf
+new file mode 100644
+index 0000000..e2d56e2
+--- /dev/null
++++ b/ucm2/MediaTek/mt8390-evk/mt8390-evk.conf
+@@ -0,0 +1,45 @@
++Syntax 4
++
++SectionUseCase."HiFi" {
++	File "/MediaTek/mt8390-evk/HiFi.conf"
++	Comment "Play high quality music"
++}
++
++BootSequence [
++	cset "name='HP Mux' Audio Playback"
++	cset "name='LOL Mux' Open"
++	cset "name='MISO0_MUX' UL1_CH1"
++	cset "name='MISO1_MUX' UL1_CH1"
++	cset "name='ADC_L_Mux' Left Preamplifier"
++	cset "name='PGA_L_Mux' AIN1"
++	cset "name='HDMI_OUT_MUX' Connect"
++	cset "name='DPTX_OUT_MUX' Disconnect"
++	cset "name='ETDM_OUT1_Clock_Source' a1sys_a2sys"
++	cset "name='ETDM_OUT2_Clock_Source' a1sys_a2sys"
++	cset "name='ETDM_OUT3_Clock_Source' a1sys_a2sys"
++	cset "name='ETDM_IN1_Clock_Source' a1sys_a2sys"
++	cset "name='ETDM_IN2_Clock_Source' a1sys_a2sys"
++	cset "name='Lineout Volume' 10"
++	cset "name='Headset Volume' 2"
++	cset "name='PGA1 Volume' 4"
++	cset "name='O000 I000 Switch' on"
++	cset "name='O001 I001 Switch' on"
++	cset "name='O002 I004 Switch' on"
++	cset "name='O003 I006 Switch' on"
++	cset "name='O034 I168 Switch' on"
++	cset "name='O035 I169 Switch' on"
++	cset "name='O036 I012 Switch' on"
++	cset "name='O037 I013 Switch' on"
++	cset "name='O040 I002 Switch' on"
++	cset "name='O041 I003 Switch' on"
++	cset "name='O048 I022 Switch' on"
++	cset "name='O049 I023 Switch' on"
++	cset "name='O050 I024 Switch' on"
++	cset "name='O051 I025 Switch' on"
++	cset "name='O052 I026 Switch' on"
++	cset "name='O053 I027 Switch' on"
++	cset "name='O054 I028 Switch' on"
++	cset "name='O055 I029 Switch' on"
++	cset "name='O176 I070 Switch' on"
++	cset "name='O177 I071 Switch' on"
++]
+\ No newline at end of file
+diff --git a/ucm2/conf.d/mt8390-evk/mt8390-evk.conf b/ucm2/conf.d/mt8390-evk/mt8390-evk.conf
+new file mode 120000
+index 0000000..5b5c2b9
+--- /dev/null
++++ b/ucm2/conf.d/mt8390-evk/mt8390-evk.conf
+@@ -0,0 +1 @@
++../../MediaTek/mt8390-evk/mt8390-evk.conf
+\ No newline at end of file
+-- 
diff --git a/debian/patches/0001-ucm2-conf.d-mt8370-evk-Fix-the-type-of-mt8370-evk.co.patch b/debian/patches/0001-ucm2-conf.d-mt8370-evk-Fix-the-type-of-mt8370-evk.co.patch
new file mode 100644
index 0000000..f78a404
--- /dev/null
+++ b/debian/patches/0001-ucm2-conf.d-mt8370-evk-Fix-the-type-of-mt8370-evk.co.patch
@@ -0,0 +1,34 @@
+From d864e945ce4171fcaf6249bebec4f683fef0f5cf Mon Sep 17 00:00:00 2001
+From: Zoran Zhan <[e-mail]>
+Date: Mon, 22 Jan 2024 11:49:08 +0800
+Subject: [PATCH] ucm2: conf.d: mt8370-evk: Fix the type of mt8370-evk.conf
+
+Fix the type of mt8370-evk.conf at /ucm2/conf.d, to let the
+symbolic link can correctly point to the conf.
+
+Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/386
+Signed-off-by: Zoran Zhan <[e-mail]>
+Signed-off-by: Jaroslav Kysela <[e-mail]>
+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commit/d864e945ce4171fcaf6249bebec4f683fef0f5cf
+Bug: https://bugs.launchpad.net/ubuntu/+source/alsa-ucm-conf/+bug/2051199
+---
+ ucm2/conf.d/mt8370-evk/mt8370-evk.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ mode change 100644 => 120000 ucm2/conf.d/mt8370-evk/mt8370-evk.conf
+
+diff --git a/ucm2/conf.d/mt8370-evk/mt8370-evk.conf b/ucm2/conf.d/mt8370-evk/mt8370-evk.conf
+deleted file mode 100644
+index 6edb08f..0000000
+--- a/ucm2/conf.d/mt8370-evk/mt8370-evk.conf
++++ /dev/null
+@@ -1 +0,0 @@
+-../../MediaTek/mt8370-evk/mt8370-evk.conf
+diff --git a/ucm2/conf.d/mt8370-evk/mt8370-evk.conf b/ucm2/conf.d/mt8370-evk/mt8370-evk.conf
+new file mode 120000
+index 0000000..fed8ef1
+--- /dev/null
++++ b/ucm2/conf.d/mt8370-evk/mt8370-evk.conf
+@@ -0,0 +1 @@
++../../MediaTek/mt8370-evk/mt8370-evk.conf
+\ No newline at end of file
+-- 
diff --git a/debian/patches/0001-ucm2-soundwire-add-rt713-SDCA-device.patch b/debian/patches/0001-ucm2-soundwire-add-rt713-SDCA-device.patch
new file mode 100644
index 0000000..b4f1387
--- /dev/null
+++ b/debian/patches/0001-ucm2-soundwire-add-rt713-SDCA-device.patch
@@ -0,0 +1,159 @@
+From b422a8e08cb3845053ece1fc832294adca21a684 Mon Sep 17 00:00:00 2001
+From: Shuming Fan <[e-mail]>
+Date: Thu, 12 Oct 2023 10:07:36 +0800
+Subject: [PATCH] ucm2: soundwire: add rt713 SDCA device
+
+Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/363
+Signed-off-by: Shuming Fan <[e-mail]>
+Signed-off-by: Jaroslav Kysela <[e-mail]>
+
+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commit/b422a8e08cb3845053ece1fc832294adca21a684
+Bug: https://bugs.launchpad.net/ubuntu/+source/alsa-ucm-conf/+bug/2042902
+Applied-Upstream: v1.2.11
+Last-Update: 2023-11-24
+
+---
+ ucm2/codecs/rt713-dmic/init.conf      |  6 ++++
+ ucm2/codecs/rt713-sdca/init.conf      |  8 ++++++
+ ucm2/sof-soundwire/rt713-dmic.conf    | 21 ++++++++++++++
+ ucm2/sof-soundwire/rt713-sdca.conf    | 40 +++++++++++++++++++++++++++
+ ucm2/sof-soundwire/sof-soundwire.conf |  6 ++--
+ 5 files changed, 78 insertions(+), 3 deletions(-)
+ create mode 100644 ucm2/codecs/rt713-dmic/init.conf
+ create mode 100644 ucm2/codecs/rt713-sdca/init.conf
+ create mode 100644 ucm2/sof-soundwire/rt713-dmic.conf
+ create mode 100644 ucm2/sof-soundwire/rt713-sdca.conf
+
+diff --git a/ucm2/codecs/rt713-dmic/init.conf b/ucm2/codecs/rt713-dmic/init.conf
+new file mode 100644
+index 0000000..6547a36
+--- /dev/null
++++ b/ucm2/codecs/rt713-dmic/init.conf
+@@ -0,0 +1,6 @@
++# RT713-dmic specific volume control settings
++
++BootSequence [
++	cset "name='rt713-dmic ADC 25 Mux' 'DMIC1'"
++	cset "name='rt713-dmic FU1E Capture Switch' 1"
++]
+diff --git a/ucm2/codecs/rt713-sdca/init.conf b/ucm2/codecs/rt713-sdca/init.conf
+new file mode 100644
+index 0000000..df6a7aa
+--- /dev/null
++++ b/ucm2/codecs/rt713-sdca/init.conf
+@@ -0,0 +1,8 @@
++# RT713-sdca specific volume control settings
++
++BootSequence [
++	cset "name='rt713 FU05 Playback Volume' 87"
++	cset "name='rt713 ADC 23 Mux' 'MIC2'"
++	cset "name='rt713 FU0F Capture Volume' 57"
++	cset "name='rt713 FU0F Capture Switch' 1"
++]
+diff --git a/ucm2/sof-soundwire/rt713-dmic.conf b/ucm2/sof-soundwire/rt713-dmic.conf
+new file mode 100644
+index 0000000..dc5fe0e
+--- /dev/null
++++ b/ucm2/sof-soundwire/rt713-dmic.conf
+@@ -0,0 +1,21 @@
++# Use case Configuration for sof-soundwire card
++
++SectionDevice."Mic" {
++	Comment	"SoundWire microphones"
++
++	EnableSequence [
++		cset "name='rt713-dmic FU1E Capture Switch' 1"
++	]
++
++	DisableSequence [
++		cset "name='rt713-dmic FU1E Capture Switch' 0"
++	]
++
++	Value {
++		CapturePriority 100
++		CapturePCM "hw:${CardId},4"
++		CaptureSwitch "rt713-dmic FU1E Capture Switch"
++		CaptureVolume "rt713-dmic FU1E Capture Volume"
++		CaptureMixerElem "rt713-dmic FU1E"
++	}
++}
+diff --git a/ucm2/sof-soundwire/rt713-sdca.conf b/ucm2/sof-soundwire/rt713-sdca.conf
+new file mode 100644
+index 0000000..f1cee7c
+--- /dev/null
++++ b/ucm2/sof-soundwire/rt713-sdca.conf
+@@ -0,0 +1,40 @@
++# Use case Configuration for sof-soundwire card
++
++SectionDevice."Headphones" {
++	Comment	"Headphones"
++
++	EnableSequence [
++		cset "name='Headphone Switch' on"
++	]
++
++	DisableSequence [
++		cset "name='Headphone Switch' off"
++	]
++
++	Value {
++	      PlaybackPriority 200
++	      PlaybackPCM "hw:${CardId}"
++	      JackControl "Headphone Jack"
++	}
++}
++
++SectionDevice."Headset" {
++	Comment "Headset Microphone"
++
++	EnableSequence [
++		cset "name='rt713 FU0F Capture Switch' 1"
++	]
++
++	DisableSequence [
++		cset "name='rt713 FU0F Capture Switch' 0"
++	]
++
++	Value {
++		CapturePriority 200
++		CapturePCM "hw:${CardId},1"
++		JackControl "Headset Mic Jack"
++		CaptureSwitch "rt713 FU0F Capture Switch"
++		CaptureVolume "rt713 FU0F Capture Volume"
++		CaptureMixerElem "rt713 FU0F"
++	}
++}
+diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf
+index 3368d65..18b1bf8 100644
+--- a/ucm2/sof-soundwire/sof-soundwire.conf
++++ b/ucm2/sof-soundwire/sof-soundwire.conf
+@@ -35,7 +35,7 @@ DefineRegex {
+ 		String "${CardComponents}"
+ 	}
+ 	MicCodec {
+-		Regex " mic:([a-z0-9]+(-sdca)?)"
++		Regex " mic:([a-z0-9]+(-dmic)?+(-sdca)?)"
+ 		String "${CardComponents}"
+ 	}
+ 	Mics {
+@@ -47,7 +47,7 @@ DefineRegex {
+ If.hs_init {
+ 	Condition {
+ 		Type RegexMatch
+-		Regex "(rt5682|rt700|rt711(-sdca)?)"
++		Regex "(rt5682|rt700|rt711|rt713(-sdca)?)"
+ 		String "${var:HeadsetCodec1}"
+ 	}
+ 	True.Include.hs_init.File "/codecs/${var:HeadsetCodec1}/init.conf"
+@@ -56,7 +56,7 @@ If.hs_init {
+ If.mic_init {
+ 	Condition {
+ 		Type RegexMatch
+-		Regex "(rt715(-sdca)?)"
++		Regex "(rt713-dmic|rt715(-sdca)?)"
+ 		String "${var:MicCodec1}"
+ 	}
+ 	True.Include.mic_init.File "/codecs/${var:MicCodec1}/init.conf"
+-- 
+2.34.1
+
diff --git a/debian/patches/0002-sof-soundwire-Add-basic-support-for-basic-cs35l56-co.patch b/debian/patches/0002-sof-soundwire-Add-basic-support-for-basic-cs35l56-co.patch
new file mode 100644
index 0000000..2ffb1bd
--- /dev/null
+++ b/debian/patches/0002-sof-soundwire-Add-basic-support-for-basic-cs35l56-co.patch
@@ -0,0 +1,62 @@
+From: Charles Keepax <[e-mail]>
+Date: Wed, 6 Dec 2023 16:46:12 +0000
+Subject: [PATCH 2/3] sof-soundwire: Add basic support for basic cs35l56
+ configurations
+
+cs35l56 is a boosted speaker amp, add UCM support for configurations
+with up to 8 amps.
+
+Signed-off-by: Charles Keepax <[e-mail]>
+Signed-off-by: Jaroslav Kysela <[e-mail]>
+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commit/8e39917518b62cce44d098bd6fe5d2c1b41f92bd
+Bug: https://github.com/alsa-project/alsa-ucm-conf/pull/370
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2069760
+Signed-off-by: Chris Chiu <[e-mail]>
+---
+ ucm2/sof-soundwire/cs35l56.conf | 40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+ create mode 100644 ucm2/sof-soundwire/cs35l56.conf
+
+--- /dev/null
++++ b/ucm2/sof-soundwire/cs35l56.conf
+@@ -0,0 +1,40 @@
++# Use case Configuration for sof-soundwire card
++
++#
++# Arguments:
++#   ForAmps - regex filter for var:SpeakerAmps
++#   Amp - amplifier number 1-8
++#
++DefineMacro.cs42l43spk.If.0 {
++	Condition {
++		Type RegexMatch
++		Regex "${var:__ForAmps}"
++		String "${var:SpeakerAmps}"
++	}
++	True {
++		EnableSequence [
++			cset "name='AMP${var:__Amp} Speaker Switch' 1"
++		]
++		DisableSequence [
++			cset "name='AMP${var:__Amp} Speaker Switch' 0"
++		]
++	}
++}
++
++SectionDevice."Speaker" {
++	Comment "Speaker"
++
++	Macro.num1.cs42l43spk { ForAmps "[1-8]" Amp 1 }
++	Macro.num2.cs42l43spk { ForAmps "[2-8]" Amp 2 }
++	Macro.num3.cs42l43spk { ForAmps "[3-8]" Amp 3 }
++	Macro.num4.cs42l43spk { ForAmps "[4-8]" Amp 4 }
++	Macro.num5.cs42l43spk { ForAmps "[5-8]" Amp 5 }
++	Macro.num6.cs42l43spk { ForAmps "[6-8]" Amp 6 }
++	Macro.num7.cs42l43spk { ForAmps "[78]" Amp 7 }
++	Macro.num8.cs42l43spk { ForAmps "8" Amp 8 }
++
++	Value {
++		PlaybackPriority 100
++		PlaybackPCM "hw:${CardId},2"
++	}
++}
diff --git a/debian/patches/0002-sof-soundwire-Add-sequence-for-controlling-Mic-Mute-.patch b/debian/patches/0002-sof-soundwire-Add-sequence-for-controlling-Mic-Mute-.patch
new file mode 100644
index 0000000..7a51a10
--- /dev/null
+++ b/debian/patches/0002-sof-soundwire-Add-sequence-for-controlling-Mic-Mute-.patch
@@ -0,0 +1,53 @@
+From: Maciej Strozek <[e-mail]>
+Date: Thu, 17 Oct 2024 13:20:27 +0100
+Subject: sof-soundwire: Add sequence for controlling Mic Mute LED
+
+Also ensure the unused microphone is disabled so that currently used mic
+can fully control the LED.
+
+Link: https://lore.kernel.org/alsa-devel/[e-mail]/
+Signed-off-by: Maciej Strozek <[e-mail]>
+Signed-off-by: Jaroslav Kysela <[e-mail]>
+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commits/e4277a204cd61f8f68f616df0d8c42e5bdeb1475
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2069760
+Signed-off-by: Chris Chiu <[e-mail]>
+---
+ ucm2/codecs/cs42l43/init.conf        | 7 +++++++
+ ucm2/sof-soundwire/cs42l43-dmic.conf | 2 ++
+ ucm2/sof-soundwire/cs42l43.conf      | 1 +
+ 3 files changed, 10 insertions(+)
+
+--- a/ucm2/codecs/cs42l43/init.conf
++++ b/ucm2/codecs/cs42l43/init.conf
+@@ -18,3 +18,10 @@
+ 		}
+ 	}
+ }
++
++FixedBootSequence [
++        exec "-/sbin/modprobe snd_ctl_led"
++        sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:cs42l43 Decimator 1 Switch"
++        sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:cs42l43 Decimator 3 Switch"
++        sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:cs42l43 Decimator 4 Switch"
++]
+--- a/ucm2/sof-soundwire/cs42l43-dmic.conf
++++ b/ucm2/sof-soundwire/cs42l43-dmic.conf
+@@ -13,6 +13,8 @@
+ 	]
+ 
+ 	DisableSequence [
++		cset "name='cs42l43 Decimator 3 Switch' 0"
++		cset "name='cs42l43 Decimator 4 Switch' 0"
+ 		cset "name='cs42l43 DP1TX1 Input' 'None'"
+ 		cset "name='cs42l43 DP1TX2 Input' 'None'"
+ 	]
+--- a/ucm2/sof-soundwire/cs42l43.conf
++++ b/ucm2/sof-soundwire/cs42l43.conf
+@@ -33,6 +33,7 @@
+ 	]
+ 
+ 	DisableSequence [
++		cset "name='cs42l43 Decimator 1 Switch' 0"
+ 		cset "name='cs42l43 DP1TX1 Input' 'None'"
+ 		cset "name='cs42l43 DP1TX2 Input' 'None'"
+ 	]
diff --git a/debian/patches/0002-sof-soundwire-Add-support-for-cs42l43-cs35l56-bridge.patch b/debian/patches/0002-sof-soundwire-Add-support-for-cs42l43-cs35l56-bridge.patch
new file mode 100644
index 0000000..50076b0
--- /dev/null
+++ b/debian/patches/0002-sof-soundwire-Add-support-for-cs42l43-cs35l56-bridge.patch
@@ -0,0 +1,95 @@
+From: Charles Keepax <[e-mail]>
+Date: Mon, 8 Jul 2024 12:59:19 +0100
+Subject: sof-soundwire: Add support for cs42l43/cs35l56 bridge configuration
+
+The cs42l43 has both a SPI master and an I2S interface, in some
+configurations 2 cs35l56 amplifiers are connected to these to provide
+bass speakers whilst the cs42l43's internal speaker drivers are used for
+the tweeters. Add UCM configuration for this type of system.
+
+Signed-off-by: Charles Keepax <[e-mail]>
+Signed-off-by: Jaroslav Kysela <[e-mail]>
+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commits/e4277a204cd61f8f68f616df0d8c42e5bdeb1475
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2069760
+Signed-off-by: Chris Chiu <[e-mail]>
+---
+ ucm2/sof-soundwire/cs35l56-bridge.conf | 61 ++++++++++++++++++++++++++++++++++
+ ucm2/sof-soundwire/sof-soundwire.conf  |  2 +-
+ 2 files changed, 62 insertions(+), 1 deletion(-)
+ create mode 100644 ucm2/sof-soundwire/cs35l56-bridge.conf
+
+--- /dev/null
++++ b/ucm2/sof-soundwire/cs35l56-bridge.conf
+@@ -0,0 +1,61 @@
++# Use case Configuration for sof-soundwire card
++
++LibraryConfig.remap.Config {
++	ctl.default.map {
++		"name='Speaker Digital Switch'" {
++			"name='AMPL Speaker Switch'".vindex.0 0
++			"name='AMPR Speaker Switch'".vindex.1 0
++		}
++		"name='Speaker Digital Volume'" {
++			"name='AMPL Speaker Volume'".vindex.0 0
++			"name='AMPR Speaker Volume'".vindex.1 0
++		}
++	}
++}
++
++SectionDevice."Speaker" {
++	Comment "Speaker"
++
++	ConflictingDevice [
++		"Headphones"
++	]
++
++	EnableSequence [
++		cset "name='cs42l43 Speaker L Input 1' 'ASPRX1'"
++		cset "name='cs42l43 Speaker R Input 1' 'ASPRX2'"
++		cset "name='cs42l43 ASPTX1 Input' 'DP5RX1'"
++		cset "name='cs42l43 ASPTX2 Input' 'DP5RX2'"
++
++		cset "name='AMPL ASP1 TX1 Source' 'DSP1TX1'"
++		cset "name='AMPL ASP1 TX2 Source' 'None'"
++		cset "name='AMPL ASP1 TX3 Source' 'None'"
++		cset "name='AMPL ASP1 TX4 Source' 'None'"
++
++		cset "name='AMPR ASP1 TX1 Source' 'None'"
++		cset "name='AMPR ASP1 TX2 Source' 'DSP1TX1'"
++		cset "name='AMPR ASP1 TX3 Source' 'None'"
++		cset "name='AMPR ASP1 TX4 Source' 'None'"
++
++		cset "name='cs42l43 Speaker Digital Switch' 1"
++		cset "name='cs42l43 Speaker Digital Volume' 128"
++	]
++
++	DisableSequence [
++		cset "name='cs42l43 Speaker Digital Switch' 0"
++
++		cset "name='AMPL ASP1 TX2 Source' 'None'"
++		cset "name='AMPR ASP1 TX1 Source' 'None'"
++
++		cset "name='cs42l43 ASPTX1 Input' 'None'"
++		cset "name='cs42l43 ASPTX2 Input' 'None'"
++		cset "name='cs42l43 Speaker L Input 1' 'None'"
++		cset "name='cs42l43 Speaker R Input 1' 'None'"
++	]
++
++	Value {
++		PlaybackPriority 100
++		PlaybackPCM "hw:${CardId},0"
++		PlaybackMixer "default:${CardId}"
++		PlaybackMixerElem "Speaker Digital"
++	}
++}
+--- a/ucm2/sof-soundwire/sof-soundwire.conf
++++ b/ucm2/sof-soundwire/sof-soundwire.conf
+@@ -19,7 +19,7 @@
+ 
+ DefineRegex {
+ 	SpeakerCodec {
+-		Regex " spk:([a-z0-9]+((-sdca)|(-spk))?)"
++		Regex " spk:([a-z0-9]+((-sdca)|(-spk)|(-bridge))?)"
+ 		String "${CardComponents}"
+ 	}
+ 	SpeakerChannels {
diff --git a/debian/patches/0002-sof-soundwire-fix-rt1318-config-copy-n-paste-error-i.patch b/debian/patches/0002-sof-soundwire-fix-rt1318-config-copy-n-paste-error-i.patch
new file mode 100644
index 0000000..36f50d0
--- /dev/null
+++ b/debian/patches/0002-sof-soundwire-fix-rt1318-config-copy-n-paste-error-i.patch
@@ -0,0 +1,30 @@
+From: Jaroslav Kysela <[e-mail]>
+Date: Mon, 11 Mar 2024 12:06:44 +0100
+Subject: sof-soundwire: fix rt1318 config copy-n-paste error in rt1318spk
+ macro
+
+Signed-off-by: Jaroslav Kysela <[e-mail]>
+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commits/4e0fcc79b7d517a957e12f02ecae5f3c69fa94dc
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2069760
+Signed-off-by: Chris Chiu <[e-mail]>
+---
+ ucm2/sof-soundwire/rt1318.conf | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/ucm2/sof-soundwire/rt1318.conf
++++ b/ucm2/sof-soundwire/rt1318.conf
+@@ -14,11 +14,11 @@
+ 	}
+ 	True {
+ 		EnableSequence [
+-			cset "name='rt1308-${var:__Amp} RX Channel Select' ${var:__Sel}"
+-			cset "name='rt1308-${var:__Amp} DAC Switch' 1"
++			cset "name='rt1318-${var:__Amp} RX Channel Select' ${var:__Sel}"
++			cset "name='rt1318-${var:__Amp} DAC Switch' 1"
+ 		]
+ 		DisableSequence [
+-			cset "name='rt1308-${var:__Amp} DAC Switch' 0"
++			cset "name='rt1318-${var:__Amp} DAC Switch' 0"
+ 		]
+ 	}
+ }
diff --git a/debian/patches/0002-ucm2-MediaTek-mt8395-evk-Add-alsa-ucm-support.patch b/debian/patches/0002-ucm2-MediaTek-mt8395-evk-Add-alsa-ucm-support.patch
new file mode 100644
index 0000000..6df8bfe
--- /dev/null
+++ b/debian/patches/0002-ucm2-MediaTek-mt8395-evk-Add-alsa-ucm-support.patch
@@ -0,0 +1,243 @@
+From 5e75929e8a487498e24db27023be0b57bac222b0 Mon Sep 17 00:00:00 2001
+From: Zoran Zhan <[e-mail]>
+Date: Thu, 1 Jun 2023 15:48:33 +0800
+Subject: [PATCH 2/3] ucm2: MediaTek: mt8395-evk: Add alsa-ucm support
+
+Add alsa-ucm support for the MediaTek mt8395-evk platform.
+
+Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/322
+Signed-off-by: Zoran Zhan <[e-mail]>
+Signed-off-by: Jaroslav Kysela <[e-mail]>
+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commit/5e75929e8a487498e24db27023be0b57bac222b0
+Bug: https://bugs.launchpad.net/ubuntu/+source/alsa-ucm-conf/+bug/2051199
+---
+ ucm2/MediaTek/mt8395-evk/HiFi.conf       | 154 +++++++++++++++++++++++
+ ucm2/MediaTek/mt8395-evk/mt8395-evk.conf |  46 +++++++
+ ucm2/conf.d/mt8395-evk/mt8395-evk.conf   |   1 +
+ 3 files changed, 201 insertions(+)
+ create mode 100644 ucm2/MediaTek/mt8395-evk/HiFi.conf
+ create mode 100644 ucm2/MediaTek/mt8395-evk/mt8395-evk.conf
+ create mode 120000 ucm2/conf.d/mt8395-evk/mt8395-evk.conf
+
+diff --git a/ucm2/MediaTek/mt8395-evk/HiFi.conf b/ucm2/MediaTek/mt8395-evk/HiFi.conf
+new file mode 100644
+index 0000000..81e4423
+--- /dev/null
++++ b/ucm2/MediaTek/mt8395-evk/HiFi.conf
+@@ -0,0 +1,154 @@
++SectionDevice."HDMI1" {
++	Comment "HDMI output"
++
++	Value {
++		PlaybackPriority 200
++		PlaybackPCM "hw:${CardId},5"
++		JackControl "HDMI Jack"
++	}
++
++	EnableSequence [
++		cset "name='HDMI_OUT_MUX' 1"
++	]
++
++	DisableSequence [
++		cset "name='HDMI_OUT_MUX' 0"
++	]
++}
++
++SectionDevice."HDMI2" {
++	Comment "DP output"
++
++	Value {
++		PlaybackPriority 200
++		PlaybackPCM "hw:${CardId},5"
++		JackControl "DP Jack"
++	}
++
++	EnableSequence [
++		cset "name='DPTX_OUT_MUX' 1"
++	]
++
++	DisableSequence [
++		cset "name='DPTX_OUT_MUX' 0"
++	]
++}
++
++SectionDevice."Speaker" {
++	Comment "Lineout speaker"
++
++	ConflictingDevice [
++		"Headphones"
++	]
++
++	EnableSequence [
++		cset "name='LOL Mux' Playback_L_DAC"
++	]
++
++	DisableSequence [
++		cset "name='LOL Mux' Open"
++	]
++
++	Value {
++		PlaybackPriority 300
++		PlaybackChannels 2
++		PlaybackPCM "hw:${CardId},0"
++	}
++}
++
++SectionDevice."Headphones" {
++	Comment "Earphone speaker"
++
++	ConflictingDevice [
++		"Speaker"
++	]
++
++	EnableSequence [
++		cset "name='HP Mux' Audio Playback"
++	]
++
++	DisableSequence [
++		cset "name='HP Mux' Open"
++	]
++
++	Value {
++		PlaybackPriority 400
++		PlaybackChannels 2
++		PlaybackPCM "hw:${CardId},0"
++	}
++}
++
++SectionDevice."Headset" {
++	Comment "Earphone microphone"
++
++	ConflictingDevice [
++		"Mic1"
++	]
++
++	EnableSequence [
++		cset "name='PGA_L_Mux' AIN1"
++	]
++
++	Value {
++		CapturePriority 400
++		CaptureChannels 3
++		CapturePCM "hw:${CardId},15"
++	}
++}
++
++SectionDevice."Mic1" {
++	Comment "Analog microphone"
++
++	ConflictingDevice [
++		"Headset"
++	]
++
++	EnableSequence [
++		cset "name='PGA_L_Mux' AIN0"
++		cset "name='O039 I169 Switch' on"
++		cset "name='O182 I170 Switch' on"
++		cset "name='MISO1_MUX' UL1_CH2"
++	]
++
++	DisableSequence [
++		cset "name='O039 I169 Switch' off"
++		cset "name='O182 I170 Switch' off"
++		cset "name='MISO1_MUX' UL1_CH1"
++	]
++
++	Value {
++		CapturePriority 300
++		CaptureChannels 3
++		CapturePCM "hw:${CardId},15"
++	}
++}
++
++SectionDevice."Mic2" {
++	Comment "Digital microphone"
++
++	Value {
++		CapturePriority 200
++		CaptureChannels 2
++		CapturePCM "hw:${CardId},14"
++	}
++}
++
++SectionDevice."Line1" {
++	Comment "PCM input"
++
++	Value {
++		CapturePriority 100
++		CaptureChannels 2
++		CapturePCM "hw:${CardId},8"
++	}
++}
++
++SectionDevice."Line2" {
++	Comment "PCM output"
++
++	Value {
++		PlaybackPriority 100
++		PlaybackChannels 2
++		PlaybackPCM "hw:${CardId},2"
++	}
++}
+\ No newline at end of file
+diff --git a/ucm2/MediaTek/mt8395-evk/mt8395-evk.conf b/ucm2/MediaTek/mt8395-evk/mt8395-evk.conf
+new file mode 100644
+index 0000000..1957b69
+--- /dev/null
++++ b/ucm2/MediaTek/mt8395-evk/mt8395-evk.conf
+@@ -0,0 +1,46 @@
++Syntax 4
++
++SectionUseCase."HiFi" {
++	File "/MediaTek/mt8395-evk/HiFi.conf"
++	Comment "Play high quality music"
++}
++
++BootSequence [
++	cset "name='HP Mux' Audio Playback"
++	cset "name='LOL Mux' Open"
++	cset "name='MISO0_MUX' UL1_CH1"
++	cset "name='MISO1_MUX' UL1_CH1"
++	cset "name='ADC_L_Mux' Left Preamplifier"
++	cset "name='ADC_R_Mux' Right Preamplifier"
++	cset "name='ADC_3_Mux' Preamplifier"
++	cset "name='PGA_L_Mux' AIN1"
++	cset "name='PGA_R_Mux' AIN2"
++	cset "name='PGA_3_Mux' AIN3"
++	cset "name='HDMI_OUT_MUX' Connect"
++	cset "name='DPTX_OUT_MUX' Disconnect"
++	cset "name='Lineout Volume' 10"
++	cset "name='Headset Volume' 2"
++	cset "name='PGA1 Volume' 4"
++	cset "name='PGA2 Volume' 4"
++	cset "name='PGA3 Volume' 4"
++	cset "name='O000 I000 Switch' on"
++	cset "name='O001 I001 Switch' on"
++	cset "name='O002 I004 Switch' on"
++	cset "name='O003 I005 Switch' on"
++	cset "name='O004 I006 Switch' on"
++	cset "name='O005 I007 Switch' on"
++	cset "name='O006 I008 Switch' on"
++	cset "name='O007 I009 Switch' on"
++	cset "name='O008 I010 Switch' on"
++	cset "name='O009 I011 Switch' on"
++	cset "name='O034 I168 Switch' on"
++	cset "name='O035 I169 Switch' on"
++	cset "name='O038 I168 Switch' on"
++	cset "name='O039 I169 Switch' on"
++	cset "name='O040 I002 Switch' on"
++	cset "name='O041 I003 Switch' on"
++	cset "name='O176 I070 Switch' on"
++	cset "name='O177 I071 Switch' on"
++	cset "name='O182 I170 Switch' on"
++	cset "name='O183 I171 Switch' on"
++]
+diff --git a/ucm2/conf.d/mt8395-evk/mt8395-evk.conf b/ucm2/conf.d/mt8395-evk/mt8395-evk.conf
+new file mode 120000
+index 0000000..30557e3
+--- /dev/null
++++ b/ucm2/conf.d/mt8395-evk/mt8395-evk.conf
+@@ -0,0 +1 @@
++../../MediaTek/mt8395-evk/mt8395-evk.conf
+\ No newline at end of file
+-- 
diff --git a/debian/patches/0003-sof-soundwire-Add-basic-support-for-cs42l43.patch b/debian/patches/0003-sof-soundwire-Add-basic-support-for-cs42l43.patch
new file mode 100644
index 0000000..1f47bac
--- /dev/null
+++ b/debian/patches/0003-sof-soundwire-Add-basic-support-for-cs42l43.patch
@@ -0,0 +1,128 @@
+From: Charles Keepax <[e-mail]>
+Date: Wed, 17 Jan 2024 14:21:25 +0000
+Subject: [PATCH 3/3] sof-soundwire: Add basic support for cs42l43
+
+cs42l43 is a codec device, add basic support for it. Including a dual
+channel DMIC input, stereo headphones, and a mono headset microphone.
+
+Signed-off-by: Charles Keepax <[e-mail]>
+Signed-off-by: Jaroslav Kysela <[e-mail]>
+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commit/e87dde51d68950537f92af955ad0633437cc419a
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2069760
+Signed-off-by: Chris Chiu <[e-mail]>
+---
+ ucm2/codecs/cs42l43/init.conf         | 14 +++++++++++
+ ucm2/sof-soundwire/cs42l43-dmic.conf  | 26 ++++++++++++++++++++
+ ucm2/sof-soundwire/cs42l43.conf       | 46 +++++++++++++++++++++++++++++++++++
+ ucm2/sof-soundwire/sof-soundwire.conf |  2 +-
+ 4 files changed, 87 insertions(+), 1 deletion(-)
+ create mode 100644 ucm2/codecs/cs42l43/init.conf
+ create mode 100644 ucm2/sof-soundwire/cs42l43-dmic.conf
+ create mode 100644 ucm2/sof-soundwire/cs42l43.conf
+
+--- /dev/null
++++ b/ucm2/codecs/cs42l43/init.conf
+@@ -0,0 +1,14 @@
++# cs42l43 specific control settings
++
++LibraryConfig.remap.Config {
++	ctl.default.map {
++		"name='cs42l43 PDM2 Switch'" {
++			"name='cs42l43 Decimator 3 Switch'".vindex.0 0
++			"name='cs42l43 Decimator 4 Switch'".vindex.1 0
++		}
++		"name='cs42l43 PDM2 Volume'" {
++			"name='cs42l43 Decimator 3 Volume'".vindex.0 0
++			"name='cs42l43 Decimator 4 Volume'".vindex.1 0
++		}
++	}
++}
+--- /dev/null
++++ b/ucm2/sof-soundwire/cs42l43-dmic.conf
+@@ -0,0 +1,26 @@
++# Use case Configuration for sof-soundwire card
++
++SectionDevice."Mic" {
++	Comment "Microphones"
++
++	ConflictingDevice [
++		"Headset"
++	]
++
++	EnableSequence [
++		cset "name='cs42l43 DP1TX1 Input' 'Decimator 3'"
++		cset "name='cs42l43 DP1TX2 Input' 'Decimator 4'"
++	]
++
++	DisableSequence [
++		cset "name='cs42l43 DP1TX1 Input' 'None'"
++		cset "name='cs42l43 DP1TX2 Input' 'None'"
++	]
++
++	Value {
++		CapturePriority 100
++		CapturePCM "hw:${CardId},4"
++		CaptureMixer "default:${CardId}"
++		CaptureMixerElem "cs42l43 PDM2"
++	}
++}
+--- /dev/null
++++ b/ucm2/sof-soundwire/cs42l43.conf
+@@ -0,0 +1,46 @@
++# Use case Configuration for sof-soundwire card
++
++SectionDevice."Headphones" {
++	Comment "Headphones"
++
++	EnableSequence [
++		cset "name='cs42l43 Headphone L Input 1' 'DP5RX1'"
++		cset "name='cs42l43 Headphone R Input 1' 'DP5RX2'"
++	]
++
++	DisableSequence [
++		cset "name='cs42l43 Headphone L Input 1' 'None'"
++		cset "name='cs42l43 Headphone R Input 1' 'None'"
++	]
++
++	Value {
++		PlaybackPriority 200
++		PlaybackPCM "hw:${CardId},0"
++		PlaybackVolume "cs42l43 Headphone Digital Volume"
++		JackControl "Headphone Jack"
++	}
++}
++
++SectionDevice."Headset" {
++	Comment "Headset Microphone"
++
++	EnableSequence [
++		cset "name='cs42l43 ADC1 Input' 'IN1'"
++		cset "name='cs42l43 Decimator 1 Mode' 'ADC'"
++
++		cset "name='cs42l43 DP1TX1 Input' 'Decimator 1'"
++		cset "name='cs42l43 DP1TX2 Input' 'Decimator 1'"
++	]
++
++	DisableSequence [
++		cset "name='cs42l43 DP1TX1 Input' 'None'"
++		cset "name='cs42l43 DP1TX2 Input' 'None'"
++	]
++
++	Value {
++		CapturePriority 200
++		CapturePCM "hw:${CardId},4"
++		CaptureMixerElem "cs42l43 Decimator 1"
++		JackControl "Headset Mic Jack"
++	}
++}
+--- a/ucm2/sof-soundwire/sof-soundwire.conf
++++ b/ucm2/sof-soundwire/sof-soundwire.conf
+@@ -47,7 +47,7 @@
+ If.hs_init {
+ 	Condition {
+ 		Type RegexMatch
+-		Regex "(rt5682|rt700|rt711|rt713(-sdca)?)"
++		Regex "(cs42l43|rt5682|rt700|rt711|rt713(-sdca)?)"
+ 		String "${var:HeadsetCodec1}"
+ 	}
+ 	True.Include.hs_init.File "/codecs/${var:HeadsetCodec1}/init.conf"
diff --git a/debian/patches/0003-sof-soundwire-rt1308-Fix-single-amp-configuration.patch b/debian/patches/0003-sof-soundwire-rt1308-Fix-single-amp-configuration.patch
new file mode 100644
index 0000000..54840df
--- /dev/null
+++ b/debian/patches/0003-sof-soundwire-rt1308-Fix-single-amp-configuration.patch
@@ -0,0 +1,36 @@
+From: Peter Ujfalusi <[e-mail]>
+Date: Mon, 11 Mar 2024 11:02:00 +0200
+Subject: sof-soundwire: rt1308: Fix single amp configuration
+
+If the device have single rt1308 amp then the codec's Channel Select should
+be set to "LR" and not to "LL". "LL" is only valid if we have 2 amps, in
+that case one is the Left and the other is the Right channel.
+
+This fixes for example Dell Latitude 9520 which only played on the Left
+speaker, Right is silent.
+
+Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/402
+Signed-off-by: Peter Ujfalusi <[e-mail]>
+Suggested-by: Jaroslav Kysela <[e-mail]>
+Signed-off-by: Jaroslav Kysela <[e-mail]>
+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commits/9e29f9e27f4e27dce40d8d6803031bb4f7be3c48
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2069760
+Signed-off-by: Chris Chiu <[e-mail]>
+---
+ ucm2/sof-soundwire/rt1308.conf | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/ucm2/sof-soundwire/rt1308.conf
++++ b/ucm2/sof-soundwire/rt1308.conf
+@@ -28,8 +28,9 @@
+ SectionDevice."Speaker" {
+ 	Comment	"Speaker"
+ 
+-	Macro.num1.rt1308spk { ForAmps "[12]" Amp 1 Sel LL }
+-	Macro.num2.rt1308spk { ForAmps "2" Amp 2 Sel RR }
++	Macro.num1.rt1308spk { ForAmps "1" Amp 1 Sel LR }
++	Macro.num2.rt1308spk { ForAmps "2" Amp 1 Sel LL }
++	Macro.num3.rt1308spk { ForAmps "2" Amp 2 Sel RR }
+ 
+ 	EnableSequence [
+ 		cset "name='Speaker Switch' on"
diff --git a/debian/patches/0003-ucm2-MediaTek-mt8370-evk-Add-alsa-ucm-support.patch b/debian/patches/0003-ucm2-MediaTek-mt8370-evk-Add-alsa-ucm-support.patch
new file mode 100644
index 0000000..89126cb
--- /dev/null
+++ b/debian/patches/0003-ucm2-MediaTek-mt8370-evk-Add-alsa-ucm-support.patch
@@ -0,0 +1,253 @@
+From a0856afae4e8e071e7626958667cde049ec81e97 Mon Sep 17 00:00:00 2001
+From: Zoran Zhan <[e-mail]>
+Date: Wed, 10 Jan 2024 20:16:17 +0800
+Subject: [PATCH 3/3] ucm2: MediaTek: mt8370-evk: Add alsa-ucm support
+
+Add alsa-ucm support for the MediaTek mt8370-evk platform.
+
+Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/380
+Signed-off-by: Zoran Zhan <[e-mail]>
+Signed-off-by: Jaroslav Kysela <[e-mail]>
+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commit/a0856afae4e8e071e7626958667cde049ec81e97
+Bug: https://bugs.launchpad.net/ubuntu/+source/alsa-ucm-conf/+bug/2051199
+---
+ ucm2/MediaTek/mt8370-evk/HiFi.conf       | 165 +++++++++++++++++++++++
+ ucm2/MediaTek/mt8370-evk/mt8370-evk.conf |  45 +++++++
+ ucm2/conf.d/mt8370-evk/mt8370-evk.conf   |   1 +
+ 3 files changed, 211 insertions(+)
+ create mode 100644 ucm2/MediaTek/mt8370-evk/HiFi.conf
+ create mode 100644 ucm2/MediaTek/mt8370-evk/mt8370-evk.conf
+ create mode 100644 ucm2/conf.d/mt8370-evk/mt8370-evk.conf
+
+diff --git a/ucm2/MediaTek/mt8370-evk/HiFi.conf b/ucm2/MediaTek/mt8370-evk/HiFi.conf
+new file mode 100644
+index 0000000..42a4582
+--- /dev/null
++++ b/ucm2/MediaTek/mt8370-evk/HiFi.conf
+@@ -0,0 +1,165 @@
++SectionDevice."HDMI1" {
++	Comment "HDMI output"
++
++	Value {
++		PlaybackPriority 300
++		PlaybackPCM "hw:${CardId},5"
++		JackControl "HDMI Jack"
++	}
++
++	EnableSequence [
++		cset "name='HDMI_OUT_MUX' 1"
++	]
++
++	DisableSequence [
++		cset "name='HDMI_OUT_MUX' 0"
++	]
++}
++
++SectionDevice."HDMI2" {
++	Comment "DP output"
++
++	Value {
++		PlaybackPriority 300
++		PlaybackPCM "hw:${CardId},5"
++		JackControl "DP Jack"
++	}
++
++	EnableSequence [
++		cset "name='DPTX_OUT_MUX' 1"
++	]
++
++	DisableSequence [
++		cset "name='DPTX_OUT_MUX' 0"
++	]
++}
++
++SectionDevice."Speaker" {
++	Comment "Lineout speaker"
++
++	ConflictingDevice [
++		"Headphones"
++	]
++
++	EnableSequence [
++		cset "name='LOL Mux' Playback_L_DAC"
++	]
++
++	DisableSequence [
++		cset "name='LOL Mux' Open"
++	]
++
++	Value {
++		PlaybackPriority 400
++		PlaybackChannels 2
++		PlaybackPCM "hw:${CardId},0"
++	}
++}
++
++SectionDevice."Headphones" {
++	Comment "Earphone speaker"
++
++	ConflictingDevice [
++		"Speaker"
++	]
++
++	EnableSequence [
++		cset "name='HP Mux' Audio Playback"
++	]
++
++	DisableSequence [
++		cset "name='HP Mux' Open"
++	]
++
++	Value {
++		PlaybackPriority 500
++		PlaybackChannels 2
++		PlaybackPCM "hw:${CardId},0"
++	}
++}
++
++SectionDevice."Headset" {
++	Comment "Earphone microphone"
++
++	ConflictingDevice [
++		"Mic1"
++	]
++
++	EnableSequence [
++		cset "name='PGA_L_Mux' AIN1"
++	]
++
++	Value {
++		CapturePriority 500
++		CaptureChannels 1
++		CapturePCM "hw:${CardId},10"
++	}
++}
++
++SectionDevice."Mic1" {
++	Comment "Analog microphone"
++
++	ConflictingDevice [
++		"Headset"
++	]
++
++	EnableSequence [
++		cset "name='PGA_L_Mux' AIN0"
++	]
++
++	Value {
++		CapturePriority 400
++		CaptureChannels 1
++		CapturePCM "hw:${CardId},10"
++	}
++}
++
++SectionDevice."Mic2" {
++	Comment "Digital microphone"
++
++	Value {
++		CapturePriority 300
++		CaptureChannels 2
++		CapturePCM "hw:${CardId},14"
++	}
++}
++
++SectionDevice."Line1" {
++	Comment "PCM input"
++
++	Value {
++		CapturePriority 200
++		CaptureChannels 2
++		CapturePCM "hw:${CardId},8"
++	}
++}
++
++SectionDevice."Line2" {
++	Comment "PCM output"
++
++	Value {
++		PlaybackPriority 200
++		PlaybackChannels 2
++		PlaybackPCM "hw:${CardId},2"
++	}
++}
++
++SectionDevice."Line3" {
++	Comment "I2S input"
++
++	Value {
++		CapturePriority 100
++		CaptureChannels 2
++		CapturePCM "hw:${CardId},11"
++	}
++}
++
++SectionDevice."Line4" {
++	Comment "I2S output"
++
++	Value {
++		PlaybackPriority 100
++		PlaybackChannels 8
++		PlaybackPCM "hw:${CardId},6"
++	}
++}
+\ No newline at end of file
+diff --git a/ucm2/MediaTek/mt8370-evk/mt8370-evk.conf b/ucm2/MediaTek/mt8370-evk/mt8370-evk.conf
+new file mode 100644
+index 0000000..2d07c46
+--- /dev/null
++++ b/ucm2/MediaTek/mt8370-evk/mt8370-evk.conf
+@@ -0,0 +1,45 @@
++Syntax 4
++
++SectionUseCase."HiFi" {
++	File "/MediaTek/mt8370-evk/HiFi.conf"
++	Comment "Play high quality music"
++}
++
++BootSequence [
++	cset "name='HP Mux' Audio Playback"
++	cset "name='LOL Mux' Open"
++	cset "name='MISO0_MUX' UL1_CH1"
++	cset "name='MISO1_MUX' UL1_CH1"
++	cset "name='ADC_L_Mux' Left Preamplifier"
++	cset "name='PGA_L_Mux' AIN1"
++	cset "name='HDMI_OUT_MUX' Connect"
++	cset "name='DPTX_OUT_MUX' Disconnect"
++	cset "name='ETDM_OUT1_Clock_Source' a1sys_a2sys"
++	cset "name='ETDM_OUT2_Clock_Source' a1sys_a2sys"
++	cset "name='ETDM_OUT3_Clock_Source' a1sys_a2sys"
++	cset "name='ETDM_IN1_Clock_Source' a1sys_a2sys"
++	cset "name='ETDM_IN2_Clock_Source' a1sys_a2sys"
++	cset "name='Lineout Volume' 10"
++	cset "name='Headset Volume' 2"
++	cset "name='PGA1 Volume' 4"
++	cset "name='O000 I000 Switch' on"
++	cset "name='O001 I001 Switch' on"
++	cset "name='O002 I004 Switch' on"
++	cset "name='O003 I006 Switch' on"
++	cset "name='O034 I168 Switch' on"
++	cset "name='O035 I169 Switch' on"
++	cset "name='O036 I012 Switch' on"
++	cset "name='O037 I013 Switch' on"
++	cset "name='O040 I002 Switch' on"
++	cset "name='O041 I003 Switch' on"
++	cset "name='O048 I022 Switch' on"
++	cset "name='O049 I023 Switch' on"
++	cset "name='O050 I024 Switch' on"
++	cset "name='O051 I025 Switch' on"
++	cset "name='O052 I026 Switch' on"
++	cset "name='O053 I027 Switch' on"
++	cset "name='O054 I028 Switch' on"
++	cset "name='O055 I029 Switch' on"
++	cset "name='O176 I070 Switch' on"
++	cset "name='O177 I071 Switch' on"
++]
+\ No newline at end of file
+diff --git a/ucm2/conf.d/mt8370-evk/mt8370-evk.conf b/ucm2/conf.d/mt8370-evk/mt8370-evk.conf
+new file mode 100644
+index 0000000..6edb08f
+--- /dev/null
++++ b/ucm2/conf.d/mt8370-evk/mt8370-evk.conf
+@@ -0,0 +1 @@
++../../MediaTek/mt8370-evk/mt8370-evk.conf
+-- 
diff --git a/debian/patches/0004-sof-soundwire-rt1316-rt1318-fix-channel-selection-fo.patch b/debian/patches/0004-sof-soundwire-rt1316-rt1318-fix-channel-selection-fo.patch
new file mode 100644
index 0000000..1a1344b
--- /dev/null
+++ b/debian/patches/0004-sof-soundwire-rt1316-rt1318-fix-channel-selection-fo.patch
@@ -0,0 +1,44 @@
+From: Jaroslav Kysela <[e-mail]>
+Date: Mon, 11 Mar 2024 13:09:08 +0100
+Subject: sof-soundwire: rt1316/rt1318 - fix channel selection for one amp
+
+Like in commit 9e29f9e27f4e27dce40d8d6803031bb4f7be3c48, use L-R
+channel selection when single amp is present.
+
+Signed-off-by: Jaroslav Kysela <[e-mail]>
+Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commits/73981e94bb69da1be5b1e4a69ff99df28bcfb320
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2069760
+Signed-off-by: Chris Chiu <[e-mail]>
+---
+ ucm2/sof-soundwire/rt1316.conf | 5 +++--
+ ucm2/sof-soundwire/rt1318.conf | 5 +++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+--- a/ucm2/sof-soundwire/rt1316.conf
++++ b/ucm2/sof-soundwire/rt1316.conf
+@@ -47,8 +47,9 @@
+ SectionDevice."Speaker" {
+ 	Comment	"Speaker"
+ 
+-	Macro.num1.rt1316spk { ForAmps "[12]" Amp 1 Sel "L,L" }
+-	Macro.num2.rt1316spk { ForAmps "2" Amp 2 Sel "R,R" }
++	Macro.num1.rt1316spk { ForAmps "1" Amp 1 Sel "L,R" }
++	Macro.num2.rt1316spk { ForAmps "2" Amp 1 Sel "L,L" }
++	Macro.num3.rt1316spk { ForAmps "2" Amp 2 Sel "R,R" }
+ 
+ 	EnableSequence [
+ 		cset "name='Speaker Switch' on"
+--- a/ucm2/sof-soundwire/rt1318.conf
++++ b/ucm2/sof-soundwire/rt1318.conf
+@@ -26,8 +26,9 @@
+ SectionDevice."Speaker" {
+ 	Comment	"Speaker"
+ 
+-	Macro.num1.rt1318spk { ForAmps "[12]" Amp 1 Sel "L,L" }
+-	Macro.num2.rt1318spk { ForAmps "2" Amp 2 Sel "R,R" }
++	Macro.num1.rt1318spk { ForAmps "1" Amp 1 Sel "L,R" }
++	Macro.num2.rt1318spk { ForAmps "2" Amp 1 Sel "L,L" }
++	Macro.num3.rt1318spk { ForAmps "2" Amp 2 Sel "R,R" }
+ 
+ 	EnableSequence [
+ 		cset "name='Speaker Switch' on"
diff --git a/debian/patches/series b/debian/patches/series
index 0583a96..0c93914 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,22 @@
 0001-ucm2-add-PinePhone-configuration.patch
 0002-ucm2-add-PineTab-configuration.patch
 0003-ucm2-add-improved-Librem-5-profiles.patch
+0001-ucm2-soundwire-add-rt713-SDCA-device.patch
+0001-ucm2-MediaTek-mt8390-evk-Add-alsa-ucm-support.patch
+0002-ucm2-MediaTek-mt8395-evk-Add-alsa-ucm-support.patch
+0003-ucm2-MediaTek-mt8370-evk-Add-alsa-ucm-support.patch
+0001-ucm2-conf.d-mt8370-evk-Fix-the-type-of-mt8370-evk.co.patch
+0001-ucm-MediaTek-mt8395-evk-Add-HDMIRX-config.patch
+0001-sof-soundwire-Use-one-file-for-speaker-codec-initial.patch
+0002-sof-soundwire-Add-basic-support-for-basic-cs35l56-co.patch
+0003-sof-soundwire-Add-basic-support-for-cs42l43.patch
+0001-sof-soundwire-fix-rt1318-config-typo-in-rt1318spk-ma.patch
+0002-sof-soundwire-fix-rt1318-config-copy-n-paste-error-i.patch
+0003-sof-soundwire-rt1308-Fix-single-amp-configuration.patch
+0004-sof-soundwire-rt1316-rt1318-fix-channel-selection-fo.patch
+0001-sof-soundwire-Add-missing-match-for-cs42l43-speakers.patch
+0002-sof-soundwire-Add-support-for-cs42l43-cs35l56-bridge.patch
+0001-sof-soundwire-Change-map-control-names-to-make-them-.patch
+0002-sof-soundwire-Add-sequence-for-controlling-Mic-Mute-.patch
+0001-acppdmmach-add-support-for-ACP-7.0.patch
+0001-sof-soundwire-Add-basic-support-for-cs42l43-s-speake.patch