diff -Nru alsa-ucm-conf-1.2.4/debian/changelog alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/changelog
--- alsa-ucm-conf-1.2.4/debian/changelog	2021-08-23 02:36:38.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/changelog	2021-10-14 23:02:35.000000000 +0000
@@ -1,3 +1,9 @@
+alsa-ucm-conf (202110142302~grate~8cff457~ubuntu21.10.1) impish; urgency=low
+
+  * Auto build.
+
+ -- Launchpad Package Builder <noreply@launchpad.net>  Thu, 14 Oct 2021 23:02:35 +0000
+
 alsa-ucm-conf (1.2.4-2ubuntu4) impish; urgency=medium
 
   * d/p/0006-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch
diff -Nru alsa-ucm-conf-1.2.4/debian/git-build-recipe.manifest alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/git-build-recipe.manifest
--- alsa-ucm-conf-1.2.4/debian/git-build-recipe.manifest	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/git-build-recipe.manifest	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,3 @@
+# git-build-recipe format 0.4 deb-version 202110142302~grate~8cff457
+lp:ubuntu/+source/alsa-ucm-conf git-commit:8cff4577c68c6342ce08f47a017a4d27cc1ed6cd
+merge build lp:~grate-driver/grate-driver/+git/alsa-ucm-conf git-commit:7688ef9a17727b290dd958877e02610e0629286f
diff -Nru alsa-ucm-conf-1.2.4/debian/patches/0001-rt715-init-setup-ADC07-to-a-proper-volume.patch alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/patches/0001-rt715-init-setup-ADC07-to-a-proper-volume.patch
--- alsa-ucm-conf-1.2.4/debian/patches/0001-rt715-init-setup-ADC07-to-a-proper-volume.patch	2021-03-18 10:10:27.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/patches/0001-rt715-init-setup-ADC07-to-a-proper-volume.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-From 263bd26b1216c933db3d216197a78678d0f8610e Mon Sep 17 00:00:00 2001
-From: Libin Yang <libin.yang@intel.com>
-Date: Thu, 19 Nov 2020 20:01:30 +0800
-Subject: [PATCH] rt715: init: setup ADC07 to a proper volume
-
-This patch initiates 'rt715 ADC 07 Capture Volume' to a proper volume.
-
-Signed-off-by: Libin Yang <libin.yang@intel.com>
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- ucm2/codecs/rt715/init.conf | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: alsa-ucm-conf-1.2.4/ucm2/codecs/rt715/init.conf
-===================================================================
---- alsa-ucm-conf-1.2.4.orig/ucm2/codecs/rt715/init.conf
-+++ alsa-ucm-conf-1.2.4/ucm2/codecs/rt715/init.conf
-@@ -7,4 +7,5 @@ BootSequence [
- 	cset "name='rt715 ADC 25 Mux' 4"
- 	cset "name='rt715 ADC 27 Capture Switch' 1"
- 	cset "name='rt715 ADC 07 Capture Switch' 1"
-+	cset "name='rt715 ADC 07 Capture Volume' 58"
- ]
diff -Nru alsa-ucm-conf-1.2.4/debian/patches/0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/patches/0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch
--- alsa-ucm-conf-1.2.4/debian/patches/0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch	2021-04-19 08:51:55.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/patches/0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,89 +0,0 @@
-From e4fc252975ca7129d366e64b409883c808401aed Mon Sep 17 00:00:00 2001
-From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-Date: Wed, 30 Sep 2020 17:20:34 -0500
-Subject: [PATCH] ucm2: soundwire: use cfg-amp instead of cfg-spk component
- string
-
-For now we don't have a specific handing of the number of speakers, we
-should be handling the number of amplifiers instead. The number of
-speakers was added in machine drivers as a placeholder, if and when we
-you it it would be in addition to the number of amplifiers, not as a
-substitute.
-
-Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-Signed-off-by: Libin Yang <libin.yang@intel.com>
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- ucm2/sof-soundwire/HiFi.conf                        | 2 +-
- ucm2/sof-soundwire/{rt1308-4.conf => rt1308-1.conf} | 7 -------
- ucm2/sof-soundwire/rt1308-2.conf                    | 7 +++++++
- 3 files changed, 8 insertions(+), 8 deletions(-)
- rename ucm2/sof-soundwire/{rt1308-4.conf => rt1308-1.conf} (63%)
-
-diff --git a/ucm2/sof-soundwire/HiFi.conf b/ucm2/sof-soundwire/HiFi.conf
-index f2240e8..e780ea4 100644
---- a/ucm2/sof-soundwire/HiFi.conf
-+++ b/ucm2/sof-soundwire/HiFi.conf
-@@ -9,7 +9,7 @@ If.spkdev {
- 		Type String
- 		Empty "${var:SpeakerCodec1}"
- 	}
--	False.Include.spkdev.File "/sof-soundwire/${var:SpeakerCodec1}-${var:SpeakerChannels1}.conf"
-+	False.Include.spkdev.File "/sof-soundwire/${var:SpeakerCodec1}-${var:SpeakerAmps1}.conf"
- }
- 
- If.micdev {
-diff --git a/ucm2/sof-soundwire/rt1308-4.conf b/ucm2/sof-soundwire/rt1308-1.conf
-similarity index 63%
-rename from ucm2/sof-soundwire/rt1308-4.conf
-rename to ucm2/sof-soundwire/rt1308-1.conf
-index f88cb81..6da5b7e 100644
---- a/ucm2/sof-soundwire/rt1308-4.conf
-+++ b/ucm2/sof-soundwire/rt1308-1.conf
-@@ -4,21 +4,14 @@ 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"
- 	]
- 
-diff --git a/ucm2/sof-soundwire/rt1308-2.conf b/ucm2/sof-soundwire/rt1308-2.conf
-index 6da5b7e..f88cb81 100644
---- a/ucm2/sof-soundwire/rt1308-2.conf
-+++ b/ucm2/sof-soundwire/rt1308-2.conf
-@@ -4,14 +4,21 @@ 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"
- 	]
diff -Nru alsa-ucm-conf-1.2.4/debian/patches/0002-Add-support-for-rt711-sdca-rt1316-and-rt715-sdca.patch alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/patches/0002-Add-support-for-rt711-sdca-rt1316-and-rt715-sdca.patch
--- alsa-ucm-conf-1.2.4/debian/patches/0002-Add-support-for-rt711-sdca-rt1316-and-rt715-sdca.patch	2021-04-19 08:51:55.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/patches/0002-Add-support-for-rt711-sdca-rt1316-and-rt715-sdca.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,230 +0,0 @@
-From 197025656ec456331d1a34357b113913ec3b187f Mon Sep 17 00:00:00 2001
-From: Libin Yang <libin.yang@intel.com>
-Date: Sun, 7 Feb 2021 12:30:58 +0800
-Subject: [PATCH] ucm2: soundwire: add basic settings for SDCA devices
-
-Add support for rt711-sdca, rt1316 and rt715-sdca (aka rt714).
-
-Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-Signed-off-by: Libin Yang <libin.yang@intel.com>
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- ucm2/codecs/rt711-sdca/init.conf      |  8 ++++++
- ucm2/codecs/rt715-sdca/init.conf      |  9 ++++++
- ucm2/sof-soundwire/rt1316-1.conf      | 22 +++++++++++++++
- ucm2/sof-soundwire/rt1316-2.conf      | 29 +++++++++++++++++++
- ucm2/sof-soundwire/rt711-sdca.conf    | 40 +++++++++++++++++++++++++++
- ucm2/sof-soundwire/rt715-sdca.conf    | 21 ++++++++++++++
- ucm2/sof-soundwire/sof-soundwire.conf | 10 +++----
- 7 files changed, 134 insertions(+), 5 deletions(-)
- create mode 100644 ucm2/codecs/rt711-sdca/init.conf
- create mode 100644 ucm2/codecs/rt715-sdca/init.conf
- create mode 100644 ucm2/sof-soundwire/rt1316-1.conf
- create mode 100644 ucm2/sof-soundwire/rt1316-2.conf
- create mode 100644 ucm2/sof-soundwire/rt711-sdca.conf
- create mode 100644 ucm2/sof-soundwire/rt715-sdca.conf
-
-Index: alsa-ucm-conf/ucm2/codecs/rt711-sdca/init.conf
-===================================================================
---- /dev/null
-+++ alsa-ucm-conf/ucm2/codecs/rt711-sdca/init.conf
-@@ -0,0 +1,8 @@
-+# RT711-sdca specific volume control settings
-+
-+BootSequence [
-+	cset "name='rt711 FU05 Playback Volume' 87"
-+	cset "name='rt711 ADC 22 Mux' 'MIC2'"
-+	cset "name='rt711 FU0F Capture Volume' 57"
-+	cset "name='rt711 FU0F Capture Switch' 1"
-+]
-Index: alsa-ucm-conf/ucm2/codecs/rt715-sdca/init.conf
-===================================================================
---- /dev/null
-+++ alsa-ucm-conf/ucm2/codecs/rt715-sdca/init.conf
-@@ -0,0 +1,9 @@
-++# RT715-sdca (aka RT714) specific volume control settings
-+
-+BootSequence [
-+	cset "name='rt714 FU0A Capture Switch' 0"
-+	cset "name='rt714 ADC 22 Mux' 'DMIC3'"
-+	cset "name='rt714 ADC 23 Mux' 'DMIC4'"
-+	cset "name='rt714 FU02 Capture Switch' 1"
-+	cset "name='rt714 FU02 Capture Volume' 124"
-+]
-Index: alsa-ucm-conf/ucm2/sof-soundwire/rt1316-1.conf
-===================================================================
---- /dev/null
-+++ alsa-ucm-conf/ucm2/sof-soundwire/rt1316-1.conf
-@@ -0,0 +1,22 @@
-+# Use case Configuration for sof-soundwire card
-+
-+SectionDevice."Speaker" {
-+	Comment	"Speaker"
-+
-+	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"
-+	]
-+
-+	Value {
-+	      PlaybackPriority 100
-+	      PlaybackPCM "hw:${CardId},2"
-+	}
-+}
-Index: alsa-ucm-conf/ucm2/sof-soundwire/rt1316-2.conf
-===================================================================
---- /dev/null
-+++ alsa-ucm-conf/ucm2/sof-soundwire/rt1316-2.conf
-@@ -0,0 +1,29 @@
-+# Use case Configuration for sof-soundwire card
-+
-+SectionDevice."Speaker" {
-+	Comment	"Speaker"
-+
-+	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"
-+	]
-+
-+	Value {
-+	      PlaybackPriority 100
-+	      PlaybackPCM "hw:${CardId},2"
-+	}
-+}
-Index: alsa-ucm-conf/ucm2/sof-soundwire/rt711-sdca.conf
-===================================================================
---- /dev/null
-+++ alsa-ucm-conf/ucm2/sof-soundwire/rt711-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='PGA2.0 2 Master Capture Switch' 1"
-+	]
-+
-+	DisableSequence [
-+		cset "name='PGA2.0 2 Master Capture Switch' 0"
-+	]
-+
-+	Value {
-+		CapturePriority 200
-+		CapturePCM "hw:${CardId},1"
-+		JackControl "Headset Mic Jack"
-+		CaptureSwitch "PGA2.0 2 Master Capture Switch"
-+		CaptureVolume "PGA2.0 2 Master Capture Volume"
-+		CaptureMixerElem "PGA2.0 2 Master"
-+	}
-+}
-Index: alsa-ucm-conf/ucm2/sof-soundwire/rt715-sdca.conf
-===================================================================
---- /dev/null
-+++ alsa-ucm-conf/ucm2/sof-soundwire/rt715-sdca.conf
-@@ -0,0 +1,21 @@
-+# Use case Configuration for sof-soundwire card
-+
-+SectionDevice."Mic" {
-+	Comment	"SoundWire microphones"
-+
-+	EnableSequence [
-+		cset "name='rt714 FU02 Capture Switch' 1"
-+	]
-+
-+	DisableSequence [
-+		cset "name='rt714 FU02 Capture Switch' 0"
-+	]
-+
-+	Value {
-+	      CapturePriority 100
-+	      CapturePCM "hw:${CardId},4"
-+	      CaptureSwitch "rt714 FU02 Capture Switch"
-+	      CaptureVolume "rt714 FU02 Capture Volume"
-+	      CaptureMixerElem "rt714 FU02"
-+	}
-+}
-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
-@@ -15,7 +15,7 @@ Define {
- 
- DefineRegex {
- 	SpeakerCodec {
--		Regex " spk:([a-z0-9]+)"
-+		Regex " spk:([a-z0-9]+(-sdca)?)"
- 		String "${CardComponents}"
- 	}
- 	SpeakerChannels {
-@@ -27,11 +27,11 @@ DefineRegex {
- 		String "${CardComponents}"
- 	}
- 	HeadsetCodec {
--		Regex " hs:([a-z0-9]+)"
-+		Regex " hs:([a-z0-9]+(-sdca)?)"
- 		String "${CardComponents}"
- 	}
- 	MicCodec {
--		Regex " mic:([a-z0-9]+)"
-+		Regex " mic:([a-z0-9]+(-sdca)?)"
- 		String "${CardComponents}"
- 	}
- }
-@@ -39,7 +39,7 @@ DefineRegex {
- If.hs_init {
- 	Condition {
- 		Type RegexMatch
--		Regex "(rt5682|rt700|rt711)"
-+		Regex "(rt5682|rt700|rt711(-sdca)?)"
- 		String "${var:HeadsetCodec1}"
- 	}
- 	True.Include.hs_init.File "/codecs/${var:HeadsetCodec1}/init.conf"
-@@ -48,7 +48,7 @@ If.hs_init {
- If.mic_init {
- 	Condition {
- 		Type RegexMatch
--		Regex "(rt715)"
-+		Regex "(rt715(-sdca)?)"
- 		String "${var:MicCodec1}"
- 	}
- 	True.Include.mic_init.File "/codecs/${var:MicCodec1}/init.conf"
diff -Nru alsa-ucm-conf-1.2.4/debian/patches/0003-rt715-don-t-initialize-obsolete-ADC-controls.patch alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/patches/0003-rt715-don-t-initialize-obsolete-ADC-controls.patch
--- alsa-ucm-conf-1.2.4/debian/patches/0003-rt715-don-t-initialize-obsolete-ADC-controls.patch	2021-07-14 00:03:50.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/patches/0003-rt715-don-t-initialize-obsolete-ADC-controls.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-From f9949919dc5e548e308ab0e9a5c6a09cc370f4c4 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Tue, 18 May 2021 19:14:47 +0200
-Subject: [PATCH] rt715: don't initialize obsolete ADC controls
-
-Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/67
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- ucm2/codecs/rt715/init.conf | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/ucm2/codecs/rt715/init.conf b/ucm2/codecs/rt715/init.conf
-index 15a0571..2baa105 100644
---- a/ucm2/codecs/rt715/init.conf
-+++ b/ucm2/codecs/rt715/init.conf
-@@ -5,7 +5,16 @@ BootSequence [
- 	cset "name='rt715 DMIC4 Boost' 2"
- 	cset "name='rt715 ADC 24 Mux' 3"
- 	cset "name='rt715 ADC 25 Mux' 4"
--	cset "name='rt715 ADC 27 Capture Switch' 1"
--	cset "name='rt715 ADC 07 Capture Switch' 1"
--	cset "name='rt715 ADC 07 Capture Volume' 58"
- ]
-+
-+If.adcxx {
-+	Condition {
-+		Type ControlExists
-+		Control "name='rt715 ADC 07 Capture Switch'"
-+	}
-+	True.BootSequence [
-+		cset "name='rt715 ADC 27 Capture Switch' 1"
-+		cset "name='rt715 ADC 07 Capture Switch' 1"
-+		cset "name='rt715 ADC 07 Capture Volume' 58"
-+	]
-+}
--- 
-2.25.1
-
diff -Nru alsa-ucm-conf-1.2.4/debian/patches/0004-sof-soundwire-rt715-use-the-hw-volume-control.patch alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/patches/0004-sof-soundwire-rt715-use-the-hw-volume-control.patch
--- alsa-ucm-conf-1.2.4/debian/patches/0004-sof-soundwire-rt715-use-the-hw-volume-control.patch	2021-07-14 00:03:50.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/patches/0004-sof-soundwire-rt715-use-the-hw-volume-control.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-From 8eed6728ff4597c28c945ba65cc7715fd528b126 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Tue, 18 May 2021 19:01:58 +0200
-Subject: [PATCH] sof-soundwire: rt715 - use the hw volume control
-
-Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/67
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- ucm2/sof-soundwire/rt715.conf | 22 ++++++++++++++++------
- 1 file changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/ucm2/sof-soundwire/rt715.conf b/ucm2/sof-soundwire/rt715.conf
-index 7b8ca59..3b191bd 100644
---- a/ucm2/sof-soundwire/rt715.conf
-+++ b/ucm2/sof-soundwire/rt715.conf
-@@ -1,20 +1,30 @@
- # Use case Configuration for sof-soundwire card
- 
-+If.hwctl {
-+	Condition {
-+		Type ControlExists
-+		Control "name='Capture Volume'"
-+	}
-+	True.Define.rt715ctl "Capture"
-+	False.Define.rt715ctl "PGA5.0 5 Master Capture"
-+}
-+
- SectionDevice."Mic" {
- 	Comment	"SoundWire microphones"
- 
- 	EnableSequence [
--		cset "name='PGA5.0 5 Master Capture Switch' 1"
-+		cset "name='${var:rt715ctl} Switch' 1"
- 	]
- 
- 	DisableSequence [
--		cset "name='PGA5.0 5 Master Capture Switch' 0"
-+		cset "name='${var:rt715ctl} Switch' 0"
- 	]
- 
- 	Value {
--	      CapturePriority 100
--	      CapturePCM "hw:${CardId},4"
--	      CaptureSwitch "PGA5.0 5 Master Capture Switch"
--	      CaptureVolume "PGA5.0 5 Master Capture Volume"
-+		CapturePriority 100
-+		CapturePCM "hw:${CardId},4"
-+		CaptureSwitch "${var:rt715ctl} Switch"
-+		CaptureVolume "${var:rt715ctl} Volume"
-+		CaptureMixerElem "${var:rt715ctl}"
- 	}
- }
--- 
-2.25.1
-
diff -Nru alsa-ucm-conf-1.2.4/debian/patches/0005-rt715-add-the-missing-sof-prefix-to-the-hw-control-n.patch alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/patches/0005-rt715-add-the-missing-sof-prefix-to-the-hw-control-n.patch
--- alsa-ucm-conf-1.2.4/debian/patches/0005-rt715-add-the-missing-sof-prefix-to-the-hw-control-n.patch	2021-07-14 00:03:50.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/patches/0005-rt715-add-the-missing-sof-prefix-to-the-hw-control-n.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-From 2f27f7ba0a4298612738c3c63455ac968bb47e38 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Tue, 18 May 2021 19:31:10 +0200
-Subject: [PATCH] rt715: add the missing sof prefix to the hw control name
-
-Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/67
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- ucm2/sof-soundwire/rt715.conf | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ucm2/sof-soundwire/rt715.conf b/ucm2/sof-soundwire/rt715.conf
-index 3b191bd..a733c08 100644
---- a/ucm2/sof-soundwire/rt715.conf
-+++ b/ucm2/sof-soundwire/rt715.conf
-@@ -3,9 +3,9 @@
- If.hwctl {
- 	Condition {
- 		Type ControlExists
--		Control "name='Capture Volume'"
-+		Control "name='rt715 Capture Volume'"
- 	}
--	True.Define.rt715ctl "Capture"
-+	True.Define.rt715ctl "rt715 Capture"
- 	False.Define.rt715ctl "PGA5.0 5 Master Capture"
- }
- 
--- 
-2.25.1
-
diff -Nru alsa-ucm-conf-1.2.4/debian/patches/0006-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/patches/0006-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch
--- alsa-ucm-conf-1.2.4/debian/patches/0006-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch	2021-08-23 02:36:38.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/patches/0006-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,139 +0,0 @@
-From 47f19f276255ddfbcb7fbb71c24f435ccf8bc7a5 Mon Sep 17 00:00:00 2001
-From: Hui Wang <hui.wang@canonical.com>
-Date: Fri, 23 Jul 2021 11:13:02 +0800
-Subject: [PATCH] sof-soundwire: rt1316 - DAC L and R is replaced by DAC
-
-In the latest codec driver rt1316-sdw.c, the DAC L and DAC R are
-replaced by DAC, so we change the ucm to add the condition checking,
-if 'DAC L' exists, will set those mixers in the old way, otherwise,
-set the mixers with new name.
-
-The codec rt1316 is used on a Dell TGL soundwire audio machine.
-
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
----
- ucm2/sof-soundwire/rt1316-1.conf | 39 +++++++++++++++++------
- ucm2/sof-soundwire/rt1316-2.conf | 54 ++++++++++++++++++++++----------
- 2 files changed, 67 insertions(+), 26 deletions(-)
-
-diff --git a/ucm2/sof-soundwire/rt1316-1.conf b/ucm2/sof-soundwire/rt1316-1.conf
-index f442a79..aa277dd 100644
---- a/ucm2/sof-soundwire/rt1316-1.conf
-+++ b/ucm2/sof-soundwire/rt1316-1.conf
-@@ -3,17 +3,36 @@
- SectionDevice."Speaker" {
- 	Comment	"Speaker"
- 
--	EnableSequence [
--		cset "name='rt1316-1 DAC L Switch' 1"
--		cset "name='rt1316-1 DAC R Switch' 1"
--		cset "name='Speaker Switch' on"
--	]
-+	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"
--	]
-+			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
-diff --git a/ucm2/sof-soundwire/rt1316-2.conf b/ucm2/sof-soundwire/rt1316-2.conf
-index f2fd9ab..94223e1 100644
---- a/ucm2/sof-soundwire/rt1316-2.conf
-+++ b/ucm2/sof-soundwire/rt1316-2.conf
-@@ -3,24 +3,46 @@
- SectionDevice."Speaker" {
- 	Comment	"Speaker"
- 
--	EnableSequence [
--		cset "name='rt1316-1 RX Channel Select' L,L"
--		cset "name='rt1316-2 RX Channel Select' R,R"
-+	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"
-+			]
- 
--		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 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"
--	]
-+			DisableSequence [
-+				cset "name='rt1316-1 DAC Switch' 0"
-+				cset "name='rt1316-2 DAC Switch' 0"
-+				cset "name='Speaker Switch' off"
-+			]
-+		}
-+	}
- 
- 	Value {
- 	      PlaybackPriority 100
--- 
-2.25.1
-
diff -Nru alsa-ucm-conf-1.2.4/debian/patches/0007-sof-hda-dsp-Set-Capture-Switch-on-in-the-BootSequenc.patch alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/patches/0007-sof-hda-dsp-Set-Capture-Switch-on-in-the-BootSequenc.patch
--- alsa-ucm-conf-1.2.4/debian/patches/0007-sof-hda-dsp-Set-Capture-Switch-on-in-the-BootSequenc.patch	2021-08-23 02:36:38.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/patches/0007-sof-hda-dsp-Set-Capture-Switch-on-in-the-BootSequenc.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-From 55d2ab5c177ec905dc46f45dd27de408c55153bd Mon Sep 17 00:00:00 2001
-From: Hui Wang <hui.wang@canonical.com>
-Date: Fri, 23 Jul 2021 11:20:50 +0800
-Subject: [PATCH] sof-hda-dsp: Set Capture Switch on in the BootSequence
-
-We found an issue that the PA source of Mic2/Headset and Mic2 is
-muted by default after newly install an OS, the root cause is the
-'Capture Switch' is set to off in the kernel.
-
-Without ucm, the /usr/share/alsa/init/default will set the 'Capture
-Switch' to on, similarly we set it to on in the BootSequence of ucm.
-
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
----
- ucm2/sof-hda-dsp/sof-hda-dsp.conf | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/ucm2/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/sof-hda-dsp/sof-hda-dsp.conf
-index 79b54a9..ca3473a 100644
---- a/ucm2/sof-hda-dsp/sof-hda-dsp.conf
-+++ b/ucm2/sof-hda-dsp/sof-hda-dsp.conf
-@@ -57,3 +57,14 @@ If.Dmic0 {
- 		cset "name='Dmic0 Capture Volume' 70%"
- 	]
- }
-+
-+If.Capture {
-+	Condition {
-+		Type ControlExists
-+		Control "name='Capture Switch'"
-+	}
-+	True.BootSequence [
-+		cset "name='Capture Volume' 60%"
-+		cset "name='Capture Switch' on"
-+	]
-+}
--- 
-2.25.1
-
diff -Nru alsa-ucm-conf-1.2.4/debian/patches/series alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/patches/series
--- alsa-ucm-conf-1.2.4/debian/patches/series	2021-08-23 02:36:38.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-0001-rt715-init-setup-ADC07-to-a-proper-volume.patch
-0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch
-0002-Add-support-for-rt711-sdca-rt1316-and-rt715-sdca.patch
-0003-rt715-don-t-initialize-obsolete-ADC-controls.patch        
-0004-sof-soundwire-rt715-use-the-hw-volume-control.patch
-0005-rt715-add-the-missing-sof-prefix-to-the-hw-control-n.patch
-0006-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch
-0007-sof-hda-dsp-Set-Capture-Switch-on-in-the-BootSequenc.patch
diff -Nru alsa-ucm-conf-1.2.4/debian/source/format alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/source/format
--- alsa-ucm-conf-1.2.4/debian/source/format	2019-10-11 11:02:05.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/debian/source/format	2021-10-14 23:02:35.000000000 +0000
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)
diff -Nru alsa-ucm-conf-1.2.4/.pc/0001-rt715-init-setup-ADC07-to-a-proper-volume.patch/ucm2/codecs/rt715/init.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/0001-rt715-init-setup-ADC07-to-a-proper-volume.patch/ucm2/codecs/rt715/init.conf
--- alsa-ucm-conf-1.2.4/.pc/0001-rt715-init-setup-ADC07-to-a-proper-volume.patch/ucm2/codecs/rt715/init.conf	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/0001-rt715-init-setup-ADC07-to-a-proper-volume.patch/ucm2/codecs/rt715/init.conf	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,10 @@
+# RT715 specific volume control settings
+
+BootSequence [
+	cset "name='rt715 DMIC3 Boost' 2"
+	cset "name='rt715 DMIC4 Boost' 2"
+	cset "name='rt715 ADC 24 Mux' 3"
+	cset "name='rt715 ADC 25 Mux' 4"
+	cset "name='rt715 ADC 27 Capture Switch' 1"
+	cset "name='rt715 ADC 07 Capture Switch' 1"
+]
diff -Nru alsa-ucm-conf-1.2.4/.pc/0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch/ucm2/sof-soundwire/HiFi.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch/ucm2/sof-soundwire/HiFi.conf
--- alsa-ucm-conf-1.2.4/.pc/0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch/ucm2/sof-soundwire/HiFi.conf	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch/ucm2/sof-soundwire/HiFi.conf	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,31 @@
+# Use case Configuration for sof-soundwire card
+
+SectionVerb {
+	Value.TQ "HiFi"
+}
+
+If.spkdev {
+	Condition {
+		Type String
+		Empty "${var:SpeakerCodec1}"
+	}
+	False.Include.spkdev.File "/sof-soundwire/${var:SpeakerCodec1}-${var:SpeakerChannels1}.conf"
+}
+
+If.micdev {
+	Condition {
+		Type String
+		Empty "${var:MicCodec1}"
+	}
+	False.Include.micdev.File "/sof-soundwire/${var:MicCodec1}.conf"
+}
+
+If.hsdev {
+	Condition {
+		Type String
+		Empty "${var:HeadsetCodec1}"
+	}
+	False.Include.hsdev.File "/sof-soundwire/${var:HeadsetCodec1}.conf"
+}
+
+<sof-soundwire/Hdmi.conf>
diff -Nru alsa-ucm-conf-1.2.4/.pc/0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch/ucm2/sof-soundwire/rt1308-2.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch/ucm2/sof-soundwire/rt1308-2.conf
--- alsa-ucm-conf-1.2.4/.pc/0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch/ucm2/sof-soundwire/rt1308-2.conf	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch/ucm2/sof-soundwire/rt1308-2.conf	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,22 @@
+# 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"
+	}
+}
diff -Nru alsa-ucm-conf-1.2.4/.pc/0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch/ucm2/sof-soundwire/rt1308-4.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch/ucm2/sof-soundwire/rt1308-4.conf
--- alsa-ucm-conf-1.2.4/.pc/0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch/ucm2/sof-soundwire/rt1308-4.conf	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch/ucm2/sof-soundwire/rt1308-4.conf	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,29 @@
+# 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"
+	}
+}
diff -Nru alsa-ucm-conf-1.2.4/.pc/0002-Add-support-for-rt711-sdca-rt1316-and-rt715-sdca.patch/ucm2/sof-soundwire/sof-soundwire.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/0002-Add-support-for-rt711-sdca-rt1316-and-rt715-sdca.patch/ucm2/sof-soundwire/sof-soundwire.conf
--- alsa-ucm-conf-1.2.4/.pc/0002-Add-support-for-rt711-sdca-rt1316-and-rt715-sdca.patch/ucm2/sof-soundwire/sof-soundwire.conf	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/0002-Add-support-for-rt711-sdca-rt1316-and-rt715-sdca.patch/ucm2/sof-soundwire/sof-soundwire.conf	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,55 @@
+Syntax 3
+
+SectionUseCase."HiFi" {
+	File "HiFi.conf"
+	Comment "Play HiFi quality Music"
+}
+
+Define {
+	SpeakerCodec1 ""
+	SpeakerChannels1 "2"
+	SpeakerAmps1 "0"
+	HeadsetCodec1 ""
+	MicCodec1 ""
+}
+
+DefineRegex {
+	SpeakerCodec {
+		Regex " spk:([a-z0-9]+)"
+		String "${CardComponents}"
+	}
+	SpeakerChannels {
+		Regex " cfg-spk:([0-9]+)"
+		String "${CardComponents}"
+	}
+	SpeakerAmps {
+		Regex " cfg-amp:([0-9]+)"
+		String "${CardComponents}"
+	}
+	HeadsetCodec {
+		Regex " hs:([a-z0-9]+)"
+		String "${CardComponents}"
+	}
+	MicCodec {
+		Regex " mic:([a-z0-9]+)"
+		String "${CardComponents}"
+	}
+}
+
+If.hs_init {
+	Condition {
+		Type RegexMatch
+		Regex "(rt5682|rt700|rt711)"
+		String "${var:HeadsetCodec1}"
+	}
+	True.Include.hs_init.File "/codecs/${var:HeadsetCodec1}/init.conf"
+}
+
+If.mic_init {
+	Condition {
+		Type RegexMatch
+		Regex "(rt715)"
+		String "${var:MicCodec1}"
+	}
+	True.Include.mic_init.File "/codecs/${var:MicCodec1}/init.conf"
+}
diff -Nru alsa-ucm-conf-1.2.4/.pc/0003-rt715-don-t-initialize-obsolete-ADC-controls.patch/ucm2/codecs/rt715/init.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/0003-rt715-don-t-initialize-obsolete-ADC-controls.patch/ucm2/codecs/rt715/init.conf
--- alsa-ucm-conf-1.2.4/.pc/0003-rt715-don-t-initialize-obsolete-ADC-controls.patch/ucm2/codecs/rt715/init.conf	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/0003-rt715-don-t-initialize-obsolete-ADC-controls.patch/ucm2/codecs/rt715/init.conf	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,11 @@
+# RT715 specific volume control settings
+
+BootSequence [
+	cset "name='rt715 DMIC3 Boost' 2"
+	cset "name='rt715 DMIC4 Boost' 2"
+	cset "name='rt715 ADC 24 Mux' 3"
+	cset "name='rt715 ADC 25 Mux' 4"
+	cset "name='rt715 ADC 27 Capture Switch' 1"
+	cset "name='rt715 ADC 07 Capture Switch' 1"
+	cset "name='rt715 ADC 07 Capture Volume' 58"
+]
diff -Nru alsa-ucm-conf-1.2.4/.pc/0004-sof-soundwire-rt715-use-the-hw-volume-control.patch/ucm2/sof-soundwire/rt715.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/0004-sof-soundwire-rt715-use-the-hw-volume-control.patch/ucm2/sof-soundwire/rt715.conf
--- alsa-ucm-conf-1.2.4/.pc/0004-sof-soundwire-rt715-use-the-hw-volume-control.patch/ucm2/sof-soundwire/rt715.conf	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/0004-sof-soundwire-rt715-use-the-hw-volume-control.patch/ucm2/sof-soundwire/rt715.conf	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,20 @@
+# Use case Configuration for sof-soundwire card
+
+SectionDevice."Mic" {
+	Comment	"SoundWire microphones"
+
+	EnableSequence [
+		cset "name='PGA5.0 5 Master Capture Switch' 1"
+	]
+
+	DisableSequence [
+		cset "name='PGA5.0 5 Master Capture Switch' 0"
+	]
+
+	Value {
+	      CapturePriority 100
+	      CapturePCM "hw:${CardId},4"
+	      CaptureSwitch "PGA5.0 5 Master Capture Switch"
+	      CaptureVolume "PGA5.0 5 Master Capture Volume"
+	}
+}
diff -Nru alsa-ucm-conf-1.2.4/.pc/0005-rt715-add-the-missing-sof-prefix-to-the-hw-control-n.patch/ucm2/sof-soundwire/rt715.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/0005-rt715-add-the-missing-sof-prefix-to-the-hw-control-n.patch/ucm2/sof-soundwire/rt715.conf
--- alsa-ucm-conf-1.2.4/.pc/0005-rt715-add-the-missing-sof-prefix-to-the-hw-control-n.patch/ucm2/sof-soundwire/rt715.conf	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/0005-rt715-add-the-missing-sof-prefix-to-the-hw-control-n.patch/ucm2/sof-soundwire/rt715.conf	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,30 @@
+# Use case Configuration for sof-soundwire card
+
+If.hwctl {
+	Condition {
+		Type ControlExists
+		Control "name='Capture Volume'"
+	}
+	True.Define.rt715ctl "Capture"
+	False.Define.rt715ctl "PGA5.0 5 Master Capture"
+}
+
+SectionDevice."Mic" {
+	Comment	"SoundWire microphones"
+
+	EnableSequence [
+		cset "name='${var:rt715ctl} Switch' 1"
+	]
+
+	DisableSequence [
+		cset "name='${var:rt715ctl} Switch' 0"
+	]
+
+	Value {
+		CapturePriority 100
+		CapturePCM "hw:${CardId},4"
+		CaptureSwitch "${var:rt715ctl} Switch"
+		CaptureVolume "${var:rt715ctl} Volume"
+		CaptureMixerElem "${var:rt715ctl}"
+	}
+}
diff -Nru alsa-ucm-conf-1.2.4/.pc/0006-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch/ucm2/sof-soundwire/rt1316-1.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/0006-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch/ucm2/sof-soundwire/rt1316-1.conf
--- alsa-ucm-conf-1.2.4/.pc/0006-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch/ucm2/sof-soundwire/rt1316-1.conf	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/0006-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch/ucm2/sof-soundwire/rt1316-1.conf	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,22 @@
+# Use case Configuration for sof-soundwire card
+
+SectionDevice."Speaker" {
+	Comment	"Speaker"
+
+	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"
+	]
+
+	Value {
+	      PlaybackPriority 100
+	      PlaybackPCM "hw:${CardId},2"
+	}
+}
diff -Nru alsa-ucm-conf-1.2.4/.pc/0006-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch/ucm2/sof-soundwire/rt1316-2.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/0006-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch/ucm2/sof-soundwire/rt1316-2.conf
--- alsa-ucm-conf-1.2.4/.pc/0006-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch/ucm2/sof-soundwire/rt1316-2.conf	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/0006-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch/ucm2/sof-soundwire/rt1316-2.conf	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,29 @@
+# Use case Configuration for sof-soundwire card
+
+SectionDevice."Speaker" {
+	Comment	"Speaker"
+
+	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"
+	]
+
+	Value {
+	      PlaybackPriority 100
+	      PlaybackPCM "hw:${CardId},2"
+	}
+}
diff -Nru alsa-ucm-conf-1.2.4/.pc/0007-sof-hda-dsp-Set-Capture-Switch-on-in-the-BootSequenc.patch/ucm2/sof-hda-dsp/sof-hda-dsp.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/0007-sof-hda-dsp-Set-Capture-Switch-on-in-the-BootSequenc.patch/ucm2/sof-hda-dsp/sof-hda-dsp.conf
--- alsa-ucm-conf-1.2.4/.pc/0007-sof-hda-dsp-Set-Capture-Switch-on-in-the-BootSequenc.patch/ucm2/sof-hda-dsp/sof-hda-dsp.conf	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/0007-sof-hda-dsp-Set-Capture-Switch-on-in-the-BootSequenc.patch/ucm2/sof-hda-dsp/sof-hda-dsp.conf	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,58 @@
+Syntax 3
+
+SectionUseCase."HiFi" {
+	File "HiFi.conf"
+	Comment "Play HiFi quality Music"
+}
+
+# the kcontrols initial values, which will be set by `alsactl init`
+
+If.amute {
+	Condition {
+		Type ControlExists
+		Control "name='Auto-Mute Mode'"
+	}
+	True.BootSequence [
+		cset "name='Auto-Mute Mode' off"
+	]
+}
+
+If.master {
+	Condition {
+		Type ControlExists
+		Control "name='Master Playback Volume'"
+	}
+	True.BootSequence [
+		cset "name='Master Playback Volume' 60%"
+	]
+}
+
+If.speaker {
+	Condition {
+		Type ControlExists
+		Control "name='Speaker Playback Volume'"
+	}
+	True.BootSequence [
+		cset "name='Speaker Playback Volume' 60%"
+	]
+}
+
+If.headphone {
+	Condition {
+		Type ControlExists
+		Control "name='Headphone Playback Volume'"
+	}
+	True.BootSequence [
+		cset "name='Headphone Playback Volume' 60%"
+	]
+}
+
+If.Dmic0 {
+	Condition {
+		Type ControlExists
+		Control "name='Dmic0 Capture Volume'"
+	}
+	True.BootSequence [
+		cset "name='Dmic0 Capture Volume' 70%"
+	]
+}
diff -Nru alsa-ucm-conf-1.2.4/.pc/applied-patches alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/applied-patches
--- alsa-ucm-conf-1.2.4/.pc/applied-patches	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/applied-patches	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,8 @@
+0001-rt715-init-setup-ADC07-to-a-proper-volume.patch
+0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch
+0002-Add-support-for-rt711-sdca-rt1316-and-rt715-sdca.patch
+0003-rt715-don-t-initialize-obsolete-ADC-controls.patch
+0004-sof-soundwire-rt715-use-the-hw-volume-control.patch
+0005-rt715-add-the-missing-sof-prefix-to-the-hw-control-n.patch
+0006-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch
+0007-sof-hda-dsp-Set-Capture-Switch-on-in-the-BootSequenc.patch
diff -Nru alsa-ucm-conf-1.2.4/.pc/.quilt_patches alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/.quilt_patches
--- alsa-ucm-conf-1.2.4/.pc/.quilt_patches	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/.quilt_patches	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1 @@
+/home/buildd/build-RECIPEBRANCHBUILD-2884122/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches
diff -Nru alsa-ucm-conf-1.2.4/.pc/.quilt_series alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/.quilt_series
--- alsa-ucm-conf-1.2.4/.pc/.quilt_series	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/.quilt_series	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1 @@
+/home/buildd/build-RECIPEBRANCHBUILD-2884122/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches/series
diff -Nru alsa-ucm-conf-1.2.4/.pc/.version alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/.version
--- alsa-ucm-conf-1.2.4/.pc/.version	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/.pc/.version	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1 @@
+2
diff -Nru "/tmp/tmpll5jh7ij/7ECRz706nt/alsa-ucm-conf-1.2.4/ucm2/Acer_Iconia_Tab/Acer Iconia Tab A500 WM8903.conf" "/tmp/tmpll5jh7ij/Gb9iGdk_GU/alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/Acer_Iconia_Tab/Acer Iconia Tab A500 WM8903.conf"
--- "/tmp/tmpll5jh7ij/7ECRz706nt/alsa-ucm-conf-1.2.4/ucm2/Acer_Iconia_Tab/Acer Iconia Tab A500 WM8903.conf"	1970-01-01 00:00:00.000000000 +0000
+++ "/tmp/tmpll5jh7ij/Gb9iGdk_GU/alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/Acer_Iconia_Tab/Acer Iconia Tab A500 WM8903.conf"	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,8 @@
+# Use case Configuration for Acer Iconia Tab A500
+
+Syntax 2
+
+SectionUseCase."HiFi" {
+	File "HiFi.conf"
+	Comment "Play HiFi quality Music"
+}
diff -Nru alsa-ucm-conf-1.2.4/ucm2/Acer_Iconia_Tab/HiFi.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/Acer_Iconia_Tab/HiFi.conf
--- alsa-ucm-conf-1.2.4/ucm2/Acer_Iconia_Tab/HiFi.conf	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/Acer_Iconia_Tab/HiFi.conf	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,112 @@
+# Use case Configuration for Acer Iconia Tab A500
+
+SectionVerb {
+	EnableSequence [
+		# WM8903 Output Configuration
+		cset "name='Digital Playback Volume' 80"
+		cset "name='Headphone Volume' 42"
+		cset "name='Line Out Volume' 42"
+		cset "name='DAC Boost Volume' 0"
+
+		# WM8903 Output Routing
+		cset "name='Left Output Mixer DACL Switch' on"
+		cset "name='Left Output Mixer DACR Switch' off"
+		cset "name='Right Output Mixer DACL Switch' off"
+		cset "name='Right Output Mixer DACR Switch' on"
+		cset "name='Int Spk Switch' on"
+
+		# WM8903 Input Configuration
+		cset "name='Digital Capture Volume' 120"
+		cset "name='DRC Compressor Threshold Volume' 124"
+		cset "name='DRC Compressor Slope R0' 1"
+		cset "name='DRC Compressor Slope R1' 1"
+		cset "name='DRC Maximum Gain Volume' 1"
+		cset "name='DRC Minimum Gain Volume' 0"
+		cset "name='DRC Volume' 13"
+
+		# WM8903 Input Routing
+		cset "name='Left Input PGA Switch' on"
+		cset "name='Right Input PGA Switch' on"
+		cset "name='Int Mic Switch' on"
+	]
+}
+
+SectionDevice."Speakers" {
+	Comment "Speakers"
+
+	ConflictingDevice [
+		"Headphones"
+	]
+
+	EnableSequence [
+		cset "name='Headphone Switch' off"
+		cset "name='Line Out Switch' on"
+	]
+
+	Value {
+		PlaybackPCM "hw:${CardId}"
+		PlaybackMixerElem "Line Out"
+	}
+}
+
+SectionDevice."Headphones" {
+	Comment "Headphones"
+
+	ConflictingDevice [
+		"Speakers"
+	]
+
+	EnableSequence [
+		cset "name='Line Out Switch' off"
+		cset "name='Headphone Switch' on"
+	]
+
+	Value {
+		PlaybackPCM "hw:${CardId}"
+		PlaybackMixerElem "Headphone"
+		JackControl "Headphone Jack"
+	}
+}
+
+SectionDevice."InternalMic" {
+	Comment "Internal Microphone"
+
+	ConflictingDevice [
+		"HeadsetMic"
+	]
+
+	EnableSequence [
+		cset "name='Left Input PGA Volume' 31"
+		cset "name='Right Input PGA Volume' 31"
+		cset "name='Left Input Inverting Mux' IN1L"
+		cset "name='Right Input Inverting Mux' IN1R"
+		cset "name='DRC Switch' on"
+	]
+
+	Value {
+		CapturePCM "hw:${CardId}"
+		CaptureMixerElem "Digital"
+	}
+}
+
+SectionDevice."HeadsetMic" {
+	Comment "Headset Microphone"
+
+	ConflictingDevice [
+		"InternalMic"
+	]
+
+	EnableSequence [
+		cset "name='Left Input PGA Volume' 25"
+		cset "name='Right Input PGA Volume' 25"
+		cset "name='Left Input Inverting Mux' IN2L"
+		cset "name='Right Input Inverting Mux' IN2R"
+		cset "name='DRC Switch' off"
+	]
+
+	Value {
+		CapturePCM "hw:${CardId}"
+		CaptureMixerElem "Digital"
+		JackControl "Mic Jack"
+	}
+}
diff -Nru "/tmp/tmpll5jh7ij/7ECRz706nt/alsa-ucm-conf-1.2.4/ucm2/Acer Iconia Tab A500 WM8903/Acer Iconia Tab A500 WM8903.conf" "/tmp/tmpll5jh7ij/Gb9iGdk_GU/alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/Acer Iconia Tab A500 WM8903/Acer Iconia Tab A500 WM8903.conf"
--- "/tmp/tmpll5jh7ij/7ECRz706nt/alsa-ucm-conf-1.2.4/ucm2/Acer Iconia Tab A500 WM8903/Acer Iconia Tab A500 WM8903.conf"	1970-01-01 00:00:00.000000000 +0000
+++ "/tmp/tmpll5jh7ij/Gb9iGdk_GU/alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/Acer Iconia Tab A500 WM8903/Acer Iconia Tab A500 WM8903.conf"	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,8 @@
+# Use case Configuration for Acer Iconia Tab A500
+
+Syntax 2
+
+SectionUseCase."HiFi" {
+	File "HiFi.conf"
+	Comment "Play HiFi quality Music"
+}
diff -Nru "/tmp/tmpll5jh7ij/7ECRz706nt/alsa-ucm-conf-1.2.4/ucm2/Acer Iconia Tab A500 WM8903/HiFi.conf" "/tmp/tmpll5jh7ij/Gb9iGdk_GU/alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/Acer Iconia Tab A500 WM8903/HiFi.conf"
--- "/tmp/tmpll5jh7ij/7ECRz706nt/alsa-ucm-conf-1.2.4/ucm2/Acer Iconia Tab A500 WM8903/HiFi.conf"	1970-01-01 00:00:00.000000000 +0000
+++ "/tmp/tmpll5jh7ij/Gb9iGdk_GU/alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/Acer Iconia Tab A500 WM8903/HiFi.conf"	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,112 @@
+# Use case Configuration for Acer Iconia Tab A500
+
+SectionVerb {
+	EnableSequence [
+		# WM8903 Output Configuration
+		cset "name='Digital Playback Volume' 80"
+		cset "name='Headphone Volume' 42"
+		cset "name='Line Out Volume' 42"
+		cset "name='DAC Boost Volume' 0"
+
+		# WM8903 Output Routing
+		cset "name='Left Output Mixer DACL Switch' on"
+		cset "name='Left Output Mixer DACR Switch' off"
+		cset "name='Right Output Mixer DACL Switch' off"
+		cset "name='Right Output Mixer DACR Switch' on"
+		cset "name='Int Spk Switch' on"
+
+		# WM8903 Input Configuration
+		cset "name='Digital Capture Volume' 120"
+		cset "name='DRC Compressor Threshold Volume' 124"
+		cset "name='DRC Compressor Slope R0' 1"
+		cset "name='DRC Compressor Slope R1' 1"
+		cset "name='DRC Maximum Gain Volume' 1"
+		cset "name='DRC Minimum Gain Volume' 0"
+		cset "name='DRC Volume' 13"
+
+		# WM8903 Input Routing
+		cset "name='Left Input PGA Switch' on"
+		cset "name='Right Input PGA Switch' on"
+		cset "name='Int Mic Switch' on"
+	]
+}
+
+SectionDevice."Speakers" {
+	Comment "Speakers"
+
+	ConflictingDevice [
+		"Headphones"
+	]
+
+	EnableSequence [
+		cset "name='Headphone Switch' off"
+		cset "name='Line Out Switch' on"
+	]
+
+	Value {
+		PlaybackPCM "hw:${CardId}"
+		PlaybackMixerElem "Line Out"
+	}
+}
+
+SectionDevice."Headphones" {
+	Comment "Headphones"
+
+	ConflictingDevice [
+		"Speakers"
+	]
+
+	EnableSequence [
+		cset "name='Line Out Switch' off"
+		cset "name='Headphone Switch' on"
+	]
+
+	Value {
+		PlaybackPCM "hw:${CardId}"
+		PlaybackMixerElem "Headphone"
+		JackControl "Headphone Jack"
+	}
+}
+
+SectionDevice."InternalMic" {
+	Comment "Internal Microphone"
+
+	ConflictingDevice [
+		"HeadsetMic"
+	]
+
+	EnableSequence [
+		cset "name='Left Input PGA Volume' 31"
+		cset "name='Right Input PGA Volume' 31"
+		cset "name='Left Input Inverting Mux' IN1L"
+		cset "name='Right Input Inverting Mux' IN1R"
+		cset "name='DRC Switch' on"
+	]
+
+	Value {
+		CapturePCM "hw:${CardId}"
+		CaptureMixerElem "Digital"
+	}
+}
+
+SectionDevice."HeadsetMic" {
+	Comment "Headset Microphone"
+
+	ConflictingDevice [
+		"InternalMic"
+	]
+
+	EnableSequence [
+		cset "name='Left Input PGA Volume' 25"
+		cset "name='Right Input PGA Volume' 25"
+		cset "name='Left Input Inverting Mux' IN2L"
+		cset "name='Right Input Inverting Mux' IN2R"
+		cset "name='DRC Switch' off"
+	]
+
+	Value {
+		CapturePCM "hw:${CardId}"
+		CaptureMixerElem "Digital"
+		JackControl "Mic Jack"
+	}
+}
diff -Nru "/tmp/tmpll5jh7ij/7ECRz706nt/alsa-ucm-conf-1.2.4/ucm2/ASUS_Google_Nex/ASUS Google Nexus 7 ALC5642.conf" "/tmp/tmpll5jh7ij/Gb9iGdk_GU/alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/ASUS_Google_Nex/ASUS Google Nexus 7 ALC5642.conf"
--- "/tmp/tmpll5jh7ij/7ECRz706nt/alsa-ucm-conf-1.2.4/ucm2/ASUS_Google_Nex/ASUS Google Nexus 7 ALC5642.conf"	1970-01-01 00:00:00.000000000 +0000
+++ "/tmp/tmpll5jh7ij/Gb9iGdk_GU/alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/ASUS_Google_Nex/ASUS Google Nexus 7 ALC5642.conf"	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,8 @@
+# Use case Configuration for ASUS Google Nexus 7 (2012)
+
+Syntax 2
+
+SectionUseCase."HiFi" {
+	File "HiFi.conf"
+	Comment "Play HiFi quality Music"
+}
diff -Nru alsa-ucm-conf-1.2.4/ucm2/ASUS_Google_Nex/HiFi.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/ASUS_Google_Nex/HiFi.conf
--- alsa-ucm-conf-1.2.4/ucm2/ASUS_Google_Nex/HiFi.conf	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/ASUS_Google_Nex/HiFi.conf	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,105 @@
+# Use case Configuration for ASUS Google Nexus 7 (2012)
+# Based on codecs/rt5640/*
+
+SectionVerb {
+	EnableSequence [
+		# RT5640 Output Configuration
+		cset "name='Speaker Playback Volume' 15"
+		cset "name='HP Playback Volume' 10"
+		cset "name='DAC1 Playback Volume' 175"
+
+		# RT5640 Output Routing
+		cset "name='OUT MIXL DAC L1 Switch' on"
+		cset "name='OUT MIXR DAC R1 Switch' on"
+		cset "name='SDI select' 0"
+		cset "name='DAI select' 0"
+		cset "name='DAC2 Playback Switch' on"
+		cset "name='DIG MIXL DAC L2 Switch' on"
+		cset "name='DAC MIXL INF1 Switch' on"
+		cset "name='DAC MIXR INF1 Switch' on"
+		cset "name='Stereo DAC MIXL DAC L1 Switch' on"
+		cset "name='Stereo DAC MIXR DAC R1 Switch' on"
+		cset "name='Stereo DAC MIXL DAC L2 Switch' on"
+		cset "name='Stereo DAC MIXR DAC R2 Switch' on"
+
+		# RT5640 Speakers Routing
+		cset "name='SPK MIXL DAC L1 Switch' on"
+		cset "name='SPK MIXR DAC R1 Switch' on"
+		cset "name='SPOL MIX SPKVOL L Switch' on"
+		cset "name='SPOR MIX SPKVOL R Switch' on"
+		cset "name='SPOL MIX SPKVOL R Switch' off"
+		cset "name='Speaker Channel Switch' on"
+
+		# NVIDIA Tegra RT5640 Speakers Switch
+		cset "name='Speakers Switch' on"
+
+		# RT5640 Headphones Routing
+		cset "name='HPO MIX HPVOL Switch' on"
+		cset "name='HP Channel Switch' on"
+
+		# RT5640 Input Configuration
+		cset "name='ADC Capture Volume' 110"
+		cset "name='ADC Boost Gain' 1"
+
+		# RT5640 Microphone Routing
+		cset "name='Stereo ADC1 Mux' ADC"
+		cset "name='Stereo ADC2 Mux' DMIC1"
+		cset "name='Stereo ADC MIXL ADC2 Switch' on"
+		cset "name='Stereo ADC MIXR ADC2 Switch' on"
+		cset "name='ADC Capture Switch' on"
+	]
+}
+
+SectionDevice."Speakers" {
+	Comment "Speakers"
+
+	ConflictingDevice [
+		"Headphones"
+	]
+
+	EnableSequence [
+		cset "name='HP L Playback Switch' off"
+		cset "name='HP R Playback Switch' off"
+		cset "name='Speaker L Playback Switch' on"
+		cset "name='Speaker R Playback Switch' on"
+	]
+
+	Value {
+		PlaybackPCM "hw:${CardId}"
+		PlaybackMixerElem "Speaker"
+		PlaybackMasterElem "DAC1"
+	}
+}
+
+SectionDevice."Headphones" {
+	Comment "Headphones"
+
+	ConflictingDevice [
+		"Speakers"
+	]
+
+	EnableSequence [
+		cset "name='Speaker L Playback Switch' off"
+		cset "name='Speaker R Playback Switch' off"
+		cset "name='HP L Playback Switch' on"
+		cset "name='HP R Playback Switch' on"
+	]
+
+	Value {
+		PlaybackPCM "hw:${CardId}"
+		PlaybackMixerElem "HP"
+		PlaybackMasterElem "DAC1"
+
+		# NVIDIA Tegra GPIO RT5640 Headphones Jack
+		JackControl "Headphones Jack"
+	}
+}
+
+SectionDevice."DigitalMics" {
+	Comment "Internal Microphone"
+
+	Value {
+		CapturePCM "hw:${CardId}"
+		CaptureMixerElem "ADC"
+	}
+}
diff -Nru "/tmp/tmpll5jh7ij/7ECRz706nt/alsa-ucm-conf-1.2.4/ucm2/ASUS Google Nexus 7 ALC5642/ASUS Google Nexus 7 ALC5642.conf" "/tmp/tmpll5jh7ij/Gb9iGdk_GU/alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/ASUS Google Nexus 7 ALC5642/ASUS Google Nexus 7 ALC5642.conf"
--- "/tmp/tmpll5jh7ij/7ECRz706nt/alsa-ucm-conf-1.2.4/ucm2/ASUS Google Nexus 7 ALC5642/ASUS Google Nexus 7 ALC5642.conf"	1970-01-01 00:00:00.000000000 +0000
+++ "/tmp/tmpll5jh7ij/Gb9iGdk_GU/alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/ASUS Google Nexus 7 ALC5642/ASUS Google Nexus 7 ALC5642.conf"	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,8 @@
+# Use case Configuration for ASUS Google Nexus 7 (2012)
+
+Syntax 2
+
+SectionUseCase."HiFi" {
+	File "HiFi.conf"
+	Comment "Play HiFi quality Music"
+}
diff -Nru "/tmp/tmpll5jh7ij/7ECRz706nt/alsa-ucm-conf-1.2.4/ucm2/ASUS Google Nexus 7 ALC5642/HiFi.conf" "/tmp/tmpll5jh7ij/Gb9iGdk_GU/alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/ASUS Google Nexus 7 ALC5642/HiFi.conf"
--- "/tmp/tmpll5jh7ij/7ECRz706nt/alsa-ucm-conf-1.2.4/ucm2/ASUS Google Nexus 7 ALC5642/HiFi.conf"	1970-01-01 00:00:00.000000000 +0000
+++ "/tmp/tmpll5jh7ij/Gb9iGdk_GU/alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/ASUS Google Nexus 7 ALC5642/HiFi.conf"	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,105 @@
+# Use case Configuration for ASUS Google Nexus 7 (2012)
+# Based on codecs/rt5640/*
+
+SectionVerb {
+	EnableSequence [
+		# RT5640 Output Configuration
+		cset "name='Speaker Playback Volume' 15"
+		cset "name='HP Playback Volume' 10"
+		cset "name='DAC1 Playback Volume' 175"
+
+		# RT5640 Output Routing
+		cset "name='OUT MIXL DAC L1 Switch' on"
+		cset "name='OUT MIXR DAC R1 Switch' on"
+		cset "name='SDI select' 0"
+		cset "name='DAI select' 0"
+		cset "name='DAC2 Playback Switch' on"
+		cset "name='DIG MIXL DAC L2 Switch' on"
+		cset "name='DAC MIXL INF1 Switch' on"
+		cset "name='DAC MIXR INF1 Switch' on"
+		cset "name='Stereo DAC MIXL DAC L1 Switch' on"
+		cset "name='Stereo DAC MIXR DAC R1 Switch' on"
+		cset "name='Stereo DAC MIXL DAC L2 Switch' on"
+		cset "name='Stereo DAC MIXR DAC R2 Switch' on"
+
+		# RT5640 Speakers Routing
+		cset "name='SPK MIXL DAC L1 Switch' on"
+		cset "name='SPK MIXR DAC R1 Switch' on"
+		cset "name='SPOL MIX SPKVOL L Switch' on"
+		cset "name='SPOR MIX SPKVOL R Switch' on"
+		cset "name='SPOL MIX SPKVOL R Switch' off"
+		cset "name='Speaker Channel Switch' on"
+
+		# NVIDIA Tegra RT5640 Speakers Switch
+		cset "name='Speakers Switch' on"
+
+		# RT5640 Headphones Routing
+		cset "name='HPO MIX HPVOL Switch' on"
+		cset "name='HP Channel Switch' on"
+
+		# RT5640 Input Configuration
+		cset "name='ADC Capture Volume' 110"
+		cset "name='ADC Boost Gain' 1"
+
+		# RT5640 Microphone Routing
+		cset "name='Stereo ADC1 Mux' ADC"
+		cset "name='Stereo ADC2 Mux' DMIC1"
+		cset "name='Stereo ADC MIXL ADC2 Switch' on"
+		cset "name='Stereo ADC MIXR ADC2 Switch' on"
+		cset "name='ADC Capture Switch' on"
+	]
+}
+
+SectionDevice."Speakers" {
+	Comment "Speakers"
+
+	ConflictingDevice [
+		"Headphones"
+	]
+
+	EnableSequence [
+		cset "name='HP L Playback Switch' off"
+		cset "name='HP R Playback Switch' off"
+		cset "name='Speaker L Playback Switch' on"
+		cset "name='Speaker R Playback Switch' on"
+	]
+
+	Value {
+		PlaybackPCM "hw:${CardId}"
+		PlaybackMixerElem "Speaker"
+		PlaybackMasterElem "DAC1"
+	}
+}
+
+SectionDevice."Headphones" {
+	Comment "Headphones"
+
+	ConflictingDevice [
+		"Speakers"
+	]
+
+	EnableSequence [
+		cset "name='Speaker L Playback Switch' off"
+		cset "name='Speaker R Playback Switch' off"
+		cset "name='HP L Playback Switch' on"
+		cset "name='HP R Playback Switch' on"
+	]
+
+	Value {
+		PlaybackPCM "hw:${CardId}"
+		PlaybackMixerElem "HP"
+		PlaybackMasterElem "DAC1"
+
+		# NVIDIA Tegra GPIO RT5640 Headphones Jack
+		JackControl "Headphones Jack"
+	}
+}
+
+SectionDevice."DigitalMics" {
+	Comment "Internal Microphone"
+
+	Value {
+		CapturePCM "hw:${CardId}"
+		CaptureMixerElem "ADC"
+	}
+}
diff -Nru alsa-ucm-conf-1.2.4/ucm2/codecs/rt711-sdca/init.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/codecs/rt711-sdca/init.conf
--- alsa-ucm-conf-1.2.4/ucm2/codecs/rt711-sdca/init.conf	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/codecs/rt711-sdca/init.conf	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,8 @@
+# RT711-sdca specific volume control settings
+
+BootSequence [
+	cset "name='rt711 FU05 Playback Volume' 87"
+	cset "name='rt711 ADC 22 Mux' 'MIC2'"
+	cset "name='rt711 FU0F Capture Volume' 57"
+	cset "name='rt711 FU0F Capture Switch' 1"
+]
diff -Nru alsa-ucm-conf-1.2.4/ucm2/codecs/rt715/init.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/codecs/rt715/init.conf
--- alsa-ucm-conf-1.2.4/ucm2/codecs/rt715/init.conf	2020-10-15 11:34:05.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/codecs/rt715/init.conf	2021-10-14 23:02:35.000000000 +0000
@@ -5,6 +5,16 @@
 	cset "name='rt715 DMIC4 Boost' 2"
 	cset "name='rt715 ADC 24 Mux' 3"
 	cset "name='rt715 ADC 25 Mux' 4"
-	cset "name='rt715 ADC 27 Capture Switch' 1"
-	cset "name='rt715 ADC 07 Capture Switch' 1"
 ]
+
+If.adcxx {
+	Condition {
+		Type ControlExists
+		Control "name='rt715 ADC 07 Capture Switch'"
+	}
+	True.BootSequence [
+		cset "name='rt715 ADC 27 Capture Switch' 1"
+		cset "name='rt715 ADC 07 Capture Switch' 1"
+		cset "name='rt715 ADC 07 Capture Volume' 58"
+	]
+}
diff -Nru alsa-ucm-conf-1.2.4/ucm2/codecs/rt715-sdca/init.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/codecs/rt715-sdca/init.conf
--- alsa-ucm-conf-1.2.4/ucm2/codecs/rt715-sdca/init.conf	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/codecs/rt715-sdca/init.conf	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,9 @@
++# RT715-sdca (aka RT714) specific volume control settings
+
+BootSequence [
+	cset "name='rt714 FU0A Capture Switch' 0"
+	cset "name='rt714 ADC 22 Mux' 'DMIC3'"
+	cset "name='rt714 ADC 23 Mux' 'DMIC4'"
+	cset "name='rt714 FU02 Capture Switch' 1"
+	cset "name='rt714 FU02 Capture Volume' 124"
+]
diff -Nru alsa-ucm-conf-1.2.4/ucm2/sof-hda-dsp/sof-hda-dsp.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/sof-hda-dsp/sof-hda-dsp.conf
--- alsa-ucm-conf-1.2.4/ucm2/sof-hda-dsp/sof-hda-dsp.conf	2020-10-15 11:34:05.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/sof-hda-dsp/sof-hda-dsp.conf	2021-10-14 23:02:35.000000000 +0000
@@ -56,3 +56,14 @@
 		cset "name='Dmic0 Capture Volume' 70%"
 	]
 }
+
+If.Capture {
+	Condition {
+		Type ControlExists
+		Control "name='Capture Switch'"
+	}
+	True.BootSequence [
+		cset "name='Capture Volume' 60%"
+		cset "name='Capture Switch' on"
+	]
+}
diff -Nru alsa-ucm-conf-1.2.4/ucm2/sof-soundwire/HiFi.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/sof-soundwire/HiFi.conf
--- alsa-ucm-conf-1.2.4/ucm2/sof-soundwire/HiFi.conf	2020-10-15 11:34:05.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/sof-soundwire/HiFi.conf	2021-10-14 23:02:35.000000000 +0000
@@ -9,7 +9,7 @@
 		Type String
 		Empty "${var:SpeakerCodec1}"
 	}
-	False.Include.spkdev.File "/sof-soundwire/${var:SpeakerCodec1}-${var:SpeakerChannels1}.conf"
+	False.Include.spkdev.File "/sof-soundwire/${var:SpeakerCodec1}-${var:SpeakerAmps1}.conf"
 }
 
 If.micdev {
diff -Nru alsa-ucm-conf-1.2.4/ucm2/sof-soundwire/rt1308-1.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/sof-soundwire/rt1308-1.conf
--- alsa-ucm-conf-1.2.4/ucm2/sof-soundwire/rt1308-1.conf	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/sof-soundwire/rt1308-1.conf	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,22 @@
+# 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"
+	}
+}
diff -Nru alsa-ucm-conf-1.2.4/ucm2/sof-soundwire/rt1308-2.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/sof-soundwire/rt1308-2.conf
--- alsa-ucm-conf-1.2.4/ucm2/sof-soundwire/rt1308-2.conf	2020-10-15 11:34:05.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/sof-soundwire/rt1308-2.conf	2021-10-14 23:02:35.000000000 +0000
@@ -4,14 +4,21 @@
 	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"
 	]
 
diff -Nru alsa-ucm-conf-1.2.4/ucm2/sof-soundwire/rt1308-4.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/sof-soundwire/rt1308-4.conf
--- alsa-ucm-conf-1.2.4/ucm2/sof-soundwire/rt1308-4.conf	2020-10-15 11:34:05.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/sof-soundwire/rt1308-4.conf	1970-01-01 00:00:00.000000000 +0000
@@ -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"
-	}
-}
diff -Nru alsa-ucm-conf-1.2.4/ucm2/sof-soundwire/rt1316-1.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/sof-soundwire/rt1316-1.conf
--- alsa-ucm-conf-1.2.4/ucm2/sof-soundwire/rt1316-1.conf	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/sof-soundwire/rt1316-1.conf	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,41 @@
+# 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"
+	}
+}
diff -Nru alsa-ucm-conf-1.2.4/ucm2/sof-soundwire/rt1316-2.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/sof-soundwire/rt1316-2.conf
--- alsa-ucm-conf-1.2.4/ucm2/sof-soundwire/rt1316-2.conf	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/sof-soundwire/rt1316-2.conf	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,51 @@
+# 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"
+	}
+}
diff -Nru alsa-ucm-conf-1.2.4/ucm2/sof-soundwire/rt711-sdca.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/sof-soundwire/rt711-sdca.conf
--- alsa-ucm-conf-1.2.4/ucm2/sof-soundwire/rt711-sdca.conf	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/sof-soundwire/rt711-sdca.conf	2021-10-14 23:02:35.000000000 +0000
@@ -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='PGA2.0 2 Master Capture Switch' 1"
+	]
+
+	DisableSequence [
+		cset "name='PGA2.0 2 Master Capture Switch' 0"
+	]
+
+	Value {
+		CapturePriority 200
+		CapturePCM "hw:${CardId},1"
+		JackControl "Headset Mic Jack"
+		CaptureSwitch "PGA2.0 2 Master Capture Switch"
+		CaptureVolume "PGA2.0 2 Master Capture Volume"
+		CaptureMixerElem "PGA2.0 2 Master"
+	}
+}
diff -Nru alsa-ucm-conf-1.2.4/ucm2/sof-soundwire/rt715.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/sof-soundwire/rt715.conf
--- alsa-ucm-conf-1.2.4/ucm2/sof-soundwire/rt715.conf	2020-10-15 11:34:05.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/sof-soundwire/rt715.conf	2021-10-14 23:02:35.000000000 +0000
@@ -1,20 +1,30 @@
 # Use case Configuration for sof-soundwire card
 
+If.hwctl {
+	Condition {
+		Type ControlExists
+		Control "name='rt715 Capture Volume'"
+	}
+	True.Define.rt715ctl "rt715 Capture"
+	False.Define.rt715ctl "PGA5.0 5 Master Capture"
+}
+
 SectionDevice."Mic" {
 	Comment	"SoundWire microphones"
 
 	EnableSequence [
-		cset "name='PGA5.0 5 Master Capture Switch' 1"
+		cset "name='${var:rt715ctl} Switch' 1"
 	]
 
 	DisableSequence [
-		cset "name='PGA5.0 5 Master Capture Switch' 0"
+		cset "name='${var:rt715ctl} Switch' 0"
 	]
 
 	Value {
-	      CapturePriority 100
-	      CapturePCM "hw:${CardId},4"
-	      CaptureSwitch "PGA5.0 5 Master Capture Switch"
-	      CaptureVolume "PGA5.0 5 Master Capture Volume"
+		CapturePriority 100
+		CapturePCM "hw:${CardId},4"
+		CaptureSwitch "${var:rt715ctl} Switch"
+		CaptureVolume "${var:rt715ctl} Volume"
+		CaptureMixerElem "${var:rt715ctl}"
 	}
 }
diff -Nru alsa-ucm-conf-1.2.4/ucm2/sof-soundwire/rt715-sdca.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/sof-soundwire/rt715-sdca.conf
--- alsa-ucm-conf-1.2.4/ucm2/sof-soundwire/rt715-sdca.conf	1970-01-01 00:00:00.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/sof-soundwire/rt715-sdca.conf	2021-10-14 23:02:35.000000000 +0000
@@ -0,0 +1,21 @@
+# Use case Configuration for sof-soundwire card
+
+SectionDevice."Mic" {
+	Comment	"SoundWire microphones"
+
+	EnableSequence [
+		cset "name='rt714 FU02 Capture Switch' 1"
+	]
+
+	DisableSequence [
+		cset "name='rt714 FU02 Capture Switch' 0"
+	]
+
+	Value {
+	      CapturePriority 100
+	      CapturePCM "hw:${CardId},4"
+	      CaptureSwitch "rt714 FU02 Capture Switch"
+	      CaptureVolume "rt714 FU02 Capture Volume"
+	      CaptureMixerElem "rt714 FU02"
+	}
+}
diff -Nru alsa-ucm-conf-1.2.4/ucm2/sof-soundwire/sof-soundwire.conf alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/sof-soundwire/sof-soundwire.conf
--- alsa-ucm-conf-1.2.4/ucm2/sof-soundwire/sof-soundwire.conf	2020-10-15 11:34:05.000000000 +0000
+++ alsa-ucm-conf-202110142302~grate~8cff457~ubuntu21.10.1/ucm2/sof-soundwire/sof-soundwire.conf	2021-10-14 23:02:35.000000000 +0000
@@ -15,7 +15,7 @@
 
 DefineRegex {
 	SpeakerCodec {
-		Regex " spk:([a-z0-9]+)"
+		Regex " spk:([a-z0-9]+(-sdca)?)"
 		String "${CardComponents}"
 	}
 	SpeakerChannels {
@@ -27,11 +27,11 @@
 		String "${CardComponents}"
 	}
 	HeadsetCodec {
-		Regex " hs:([a-z0-9]+)"
+		Regex " hs:([a-z0-9]+(-sdca)?)"
 		String "${CardComponents}"
 	}
 	MicCodec {
-		Regex " mic:([a-z0-9]+)"
+		Regex " mic:([a-z0-9]+(-sdca)?)"
 		String "${CardComponents}"
 	}
 }
@@ -39,7 +39,7 @@
 If.hs_init {
 	Condition {
 		Type RegexMatch
-		Regex "(rt5682|rt700|rt711)"
+		Regex "(rt5682|rt700|rt711(-sdca)?)"
 		String "${var:HeadsetCodec1}"
 	}
 	True.Include.hs_init.File "/codecs/${var:HeadsetCodec1}/init.conf"
@@ -48,7 +48,7 @@
 If.mic_init {
 	Condition {
 		Type RegexMatch
-		Regex "(rt715)"
+		Regex "(rt715(-sdca)?)"
 		String "${var:MicCodec1}"
 	}
 	True.Include.mic_init.File "/codecs/${var:MicCodec1}/init.conf"