db6034
From 2667378a6b9120d99e44f783ac4d247fb683d83c Mon Sep 17 00:00:00 2001
db6034
From: =?UTF-8?q?N=C3=ADcolas=20F=2E=20R=2E=20A=2E=20Prado?=
db6034
 <nfraprado@collabora.com>
db6034
Date: Thu, 24 Mar 2022 18:13:45 -0400
db6034
Subject: [PATCH 01/21] ucm2: Add support for MT8192 Asurada Spherion
db6034
 Chromebook
db6034
MIME-Version: 1.0
db6034
Content-Type: text/plain; charset=UTF-8
db6034
Content-Transfer-Encoding: 8bit
db6034
db6034
Add support for the Acer Chromebook 514 CP514-2H, powered by MediaTek
db6034
Kompanio 820 (MT8192). This machine uses a MT6359 PMIC, with RT1015P as
db6034
speaker codec and RT5682 as headphone codec.
db6034
db6034
Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/217
db6034
Signed-off-by: NĂ­colas F. R. A. Prado <nfraprado@collabora.com>
db6034
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
db6034
---
db6034
 .../mt8192/mt6359-rt1015p-rt5682/HiFi.conf    | 88 +++++++++++++++++++
db6034
 .../mt8192/mt6359-rt1015p-rt5682/init.conf    | 24 +++++
db6034
 .../mt8192_mt6359_rt1015p_rt5682.conf         | 11 +++
db6034
 .../mt8192_mt6359_rt1015p_rt5682.conf         |  1 +
db6034
 4 files changed, 124 insertions(+)
db6034
 create mode 100644 ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/HiFi.conf
db6034
 create mode 100644 ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/init.conf
db6034
 create mode 100644 ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/mt8192_mt6359_rt1015p_rt5682.conf
db6034
 create mode 120000 ucm2/conf.d/mt8192_mt6359/mt8192_mt6359_rt1015p_rt5682.conf
db6034
db6034
diff --git a/ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/HiFi.conf b/ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/HiFi.conf
db6034
new file mode 100644
db6034
index 0000000..cf0d2c1
db6034
--- /dev/null
db6034
+++ b/ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/HiFi.conf
db6034
@@ -0,0 +1,88 @@
db6034
+SectionVerb {
db6034
+	EnableSequence [
db6034
+		disdevall ""
db6034
+	]
db6034
+
db6034
+	Value {
db6034
+		TQ "HiFi"
db6034
+	}
db6034
+}
db6034
+
db6034
+SectionDevice."Speaker" {
db6034
+	Comment "Speaker"
db6034
+
db6034
+	EnableSequence [
db6034
+		cset "name='Speakers Switch' 1"
db6034
+	]
db6034
+
db6034
+	DisableSequence [
db6034
+		cset "name='Speakers Switch' 0"
db6034
+	]
db6034
+
db6034
+	Value {
db6034
+		PlaybackPCM "hw:${CardId},0"
db6034
+		PlaybackPriority 100
db6034
+	}
db6034
+}
db6034
+
db6034
+SectionDevice."Headphones" {
db6034
+	Comment "Headphones"
db6034
+
db6034
+	EnableSequence [
db6034
+		cset "name='Headphone Jack Switch' 1"
db6034
+	]
db6034
+
db6034
+	DisableSequence [
db6034
+		cset "name='Headphone Jack Switch' 0"
db6034
+	]
db6034
+
db6034
+	Value {
db6034
+		PlaybackPCM "hw:${CardId},3"
db6034
+		JackControl "Headphone Jack"
db6034
+		PlaybackMixerElem "DAC1"
db6034
+		PlaybackPriority 200
db6034
+	}
db6034
+}
db6034
+
db6034
+SectionDevice."Mic" {
db6034
+	Comment "Internal Microphone"
db6034
+
db6034
+	EnableSequence [
db6034
+		cset "name='MTKAIF_DMIC Switch' 1"
db6034
+	]
db6034
+
db6034
+	DisableSequence [
db6034
+		cset "name='MTKAIF_DMIC Switch' 0"
db6034
+	]
db6034
+
db6034
+	Value {
db6034
+		CapturePCM "hw:${CardId},10"
db6034
+		CapturePriority 100
db6034
+	}
db6034
+}
db6034
+
db6034
+SectionDevice."Headset" {
db6034
+	Comment "Headset Microphone"
db6034
+
db6034
+	EnableSequence [
db6034
+		cset "name='Headset Mic Switch' 1"
db6034
+		cset "name='STO1 ADC Capture Switch' 1"
db6034
+		cset "name='RECMIX1L CBJ Switch' 1"
db6034
+		cset "name='Stereo1 ADC MIXL ADC1 Switch' 1"
db6034
+		cset "name='Stereo1 ADC MIXR ADC1 Switch' 1"
db6034
+	]
db6034
+
db6034
+	DisableSequence [
db6034
+		cset "name='STO1 ADC Capture Switch' 0"
db6034
+		cset "name='RECMIX1L CBJ Switch' 0"
db6034
+		cset "name='Stereo1 ADC MIXL ADC1 Switch' 0"
db6034
+		cset "name='Stereo1 ADC MIXR ADC1 Switch' 0"
db6034
+		cset "name='Headset Mic Switch' 0"
db6034
+	]
db6034
+
db6034
+	Value {
db6034
+		CapturePCM  "hw:${CardId},11"
db6034
+		JackControl "Headset Mic Jack"
db6034
+		CapturePriority 200
db6034
+	}
db6034
+}
db6034
diff --git a/ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/init.conf b/ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/init.conf
db6034
new file mode 100644
db6034
index 0000000..b53178e
db6034
--- /dev/null
db6034
+++ b/ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/init.conf
db6034
@@ -0,0 +1,24 @@
db6034
+BootSequence [
db6034
+	# Speaker
db6034
+	cset "name='I2S3_CH1 DL1_CH1' 1"
db6034
+	cset "name='I2S3_CH2 DL1_CH2' 1"
db6034
+	cset "name='I2S3_HD_Mux' 1"
db6034
+
db6034
+	# Headphone
db6034
+	cset "name='I2S9_CH1 DL3_CH1' 1"
db6034
+	cset "name='I2S9_CH2 DL3_CH2' 1"
db6034
+	cset "name='I2S9_HD_Mux' 1"
db6034
+
db6034
+	# Internal Mic
db6034
+	cset "name='UL1_CH1 ADDA_UL_CH1' 1"
db6034
+	cset "name='UL1_CH2 ADDA_UL_CH2' 1"
db6034
+	cset "name='UL_SRC_MUX' DMIC"
db6034
+
db6034
+	# Headset Mic
db6034
+	cset "name='UL2_CH1 I2S8_CH1' 1"
db6034
+	cset "name='UL2_CH2 I2S8_CH2' 1"
db6034
+	cset "name='I2S8_HD_Mux' 1"
db6034
+	cset "name='Stereo1 ADC L1 Mux' 1"
db6034
+	cset "name='Stereo1 ADC R1 Mux' 1"
db6034
+	cset "name='CBJ Boost Volume' 3"
db6034
+]
db6034
diff --git a/ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/mt8192_mt6359_rt1015p_rt5682.conf b/ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/mt8192_mt6359_rt1015p_rt5682.conf
db6034
new file mode 100644
db6034
index 0000000..b4e124d
db6034
--- /dev/null
db6034
+++ b/ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/mt8192_mt6359_rt1015p_rt5682.conf
db6034
@@ -0,0 +1,11 @@
db6034
+Comment "MT8192 MT6359 RT1015P RT5682 sound card"
db6034
+Syntax 4
db6034
+
db6034
+SectionUseCase."HiFi" {
db6034
+  File "HiFi.conf"
db6034
+  Comment "Default"
db6034
+}
db6034
+
db6034
+Include.card-init.File "/lib/card-init.conf"
db6034
+Include.ctl-remap.File "/lib/ctl-remap.conf"
db6034
+Include.init.File "init.conf"
db6034
diff --git a/ucm2/conf.d/mt8192_mt6359/mt8192_mt6359_rt1015p_rt5682.conf b/ucm2/conf.d/mt8192_mt6359/mt8192_mt6359_rt1015p_rt5682.conf
db6034
new file mode 120000
db6034
index 0000000..4425b19
db6034
--- /dev/null
db6034
+++ b/ucm2/conf.d/mt8192_mt6359/mt8192_mt6359_rt1015p_rt5682.conf
db6034
@@ -0,0 +1 @@
db6034
+../../MediaTek/mt8192/mt6359-rt1015p-rt5682/mt8192_mt6359_rt1015p_rt5682.conf
db6034
\ No newline at end of file
db6034
-- 
db6034
2.39.0
db6034
db6034
db6034
From 6dee56f11fbd48dd412179722a445416fcd779ef Mon Sep 17 00:00:00 2001
db6034
From: Jaroslav Kysela <perex@perex.cz>
db6034
Date: Sun, 6 Nov 2022 18:08:27 +0100
db6034
Subject: [PATCH 02/21] ucm: USB-Audio - Add support for Focusrite Scarlett 2i2
db6034
 gen2
db6034
db6034
BugLink: https://github.com/alsa-project/alsa-ucm-conf/pull/234
db6034
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
db6034
---
db6034
 ...2-HiFi.conf => Scarlett-2i-gen2-HiFi.conf} | 45 +++++++++++--------
db6034
 .../USB-Audio/Focusrite/Scarlett-2i-gen2.conf | 22 +++++++++
db6034
 .../Focusrite/Scarlett-2i4-gen2.conf          | 11 -----
db6034
 ucm2/USB-Audio/USB-Audio.conf                 | 10 ++---
db6034
 4 files changed, 53 insertions(+), 35 deletions(-)
db6034
 rename ucm2/USB-Audio/Focusrite/{Scarlett-2i4-gen2-HiFi.conf => Scarlett-2i-gen2-HiFi.conf} (65%)
db6034
 create mode 100644 ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2.conf
db6034
 delete mode 100644 ucm2/USB-Audio/Focusrite/Scarlett-2i4-gen2.conf
db6034
db6034
diff --git a/ucm2/USB-Audio/Focusrite/Scarlett-2i4-gen2-HiFi.conf b/ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2-HiFi.conf
db6034
similarity index 65%
db6034
rename from ucm2/USB-Audio/Focusrite/Scarlett-2i4-gen2-HiFi.conf
db6034
rename to ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2-HiFi.conf
db6034
index 5ee5076..ab69bc7 100644
db6034
--- a/ucm2/USB-Audio/Focusrite/Scarlett-2i4-gen2-HiFi.conf
db6034
+++ b/ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2-HiFi.conf
db6034
@@ -3,7 +3,7 @@ Include.pcm_split.File "/common/pcm/split.conf"
db6034
 Macro [
db6034
 	{
db6034
 		SplitPCM {
db6034
-			Name "scarlett2i4_stereo_out"
db6034
+			Name "scarlett2i_stereo_out"
db6034
 			Direction Playback
db6034
 			Format S32_LE
db6034
 			Channels 2
db6034
@@ -16,7 +16,7 @@ Macro [
db6034
 	}
db6034
 	{
db6034
 		SplitPCM {
db6034
-			Name "scarlett2i4_mono_in"
db6034
+			Name "scarlett2i_mono_in"
db6034
 			Direction Capture
db6034
 			Format S32_LE
db6034
 			Channels 1
db6034
@@ -33,7 +33,7 @@ SectionDevice."Line1" {
db6034
 		PlaybackPriority 200
db6034
 	}
db6034
 	Macro.pcm_split.SplitPCMDevice {
db6034
-		Name "scarlett2i4_stereo_out"
db6034
+		Name "scarlett2i_stereo_out"
db6034
 		Direction Playback
db6034
 		HWChannels 4
db6034
 		Channels 2
db6034
@@ -44,21 +44,28 @@ SectionDevice."Line1" {
db6034
 	}
db6034
 }
db6034
 
db6034
-SectionDevice."Line2" {
db6034
-	Comment "Line 3-4"
db6034
-
db6034
-	Value {
db6034
-		PlaybackPriority 100
db6034
+If.scarlett_2i4 {
db6034
+	Condition {
db6034
+		Type String
db6034
+		String1 "${var:PlaybackChannels}"
db6034
+		String2 "4"
db6034
 	}
db6034
-	Macro.pcm_split.SplitPCMDevice {
db6034
-		Name "scarlett2i4_stereo_out"
db6034
-		Direction Playback
db6034
-		HWChannels 4
db6034
-		Channels 2
db6034
-		Channel0 2
db6034
-		Channel1 3
db6034
-		ChannelPos0 FL
db6034
-		ChannelPos1 FR
db6034
+	True.SectionDevice."Line2" {
db6034
+		Comment "Line 3-4"
db6034
+
db6034
+		Value {
db6034
+			PlaybackPriority 100
db6034
+		}
db6034
+		Macro.pcm_split.SplitPCMDevice {
db6034
+			Name "scarlett2i_stereo_out"
db6034
+			Direction Playback
db6034
+			HWChannels 4
db6034
+			Channels 2
db6034
+			Channel0 2
db6034
+			Channel1 3
db6034
+			ChannelPos0 FL
db6034
+			ChannelPos1 FR
db6034
+		}
db6034
 	}
db6034
 }
db6034
 
db6034
@@ -69,7 +76,7 @@ SectionDevice."Mic1" {
db6034
 		CapturePriority 200
db6034
 	}
db6034
 	Macro.pcm_split.SplitPCMDevice {
db6034
-		Name "scarlett2i4_mono_in"
db6034
+		Name "scarlett2i_mono_in"
db6034
 		Direction Capture
db6034
 		HWChannels 2
db6034
 		Channels 1
db6034
@@ -85,7 +92,7 @@ SectionDevice."Mic2" {
db6034
 		CapturePriority 100
db6034
 	}
db6034
 	Macro.pcm_split.SplitPCMDevice {
db6034
-		Name "scarlett2i4_mono_in"
db6034
+		Name "scarlett2i_mono_in"
db6034
 		Direction Capture
db6034
 		HWChannels 2
db6034
 		Channels 1
db6034
diff --git a/ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2.conf b/ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2.conf
db6034
new file mode 100644
db6034
index 0000000..ee5b0b5
db6034
--- /dev/null
db6034
+++ b/ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2.conf
db6034
@@ -0,0 +1,22 @@
db6034
+Define.PlaybackChannels 4
db6034
+
db6034
+If.scarlett_2i4 {
db6034
+	Condition {
db6034
+		Type String
db6034
+		Haystack "${CardComponents}"
db6034
+		Needle "USB1235:8202"
db6034
+	}
db6034
+	True.Define.PlaybackChannels 2
db6034
+}
db6034
+
db6034
+Comment "Focusrite Scarlett 2i${var:PlaybackChannels} Gen 2"
db6034
+
db6034
+SectionUseCase."HiFi" {
db6034
+    Comment "Default"
db6034
+    File "/USB-Audio/Focusrite/Scarlett-2i-gen2-HiFi.conf"
db6034
+}
db6034
+
db6034
+Define.DirectPlaybackChannels "${var:PlaybackChannels}"
db6034
+Define.DirectCaptureChannels 2
db6034
+
db6034
+Include.dhw.File "/common/direct.conf"
db6034
diff --git a/ucm2/USB-Audio/Focusrite/Scarlett-2i4-gen2.conf b/ucm2/USB-Audio/Focusrite/Scarlett-2i4-gen2.conf
db6034
deleted file mode 100644
db6034
index ffc296d..0000000
db6034
--- a/ucm2/USB-Audio/Focusrite/Scarlett-2i4-gen2.conf
db6034
+++ /dev/null
db6034
@@ -1,11 +0,0 @@
db6034
-Comment "Focusrite Scarlett 2i4 Gen 2"
db6034
-
db6034
-SectionUseCase."HiFi" {
db6034
-    Comment "Default"
db6034
-    File "/USB-Audio/Focusrite/Scarlett-2i4-gen2-HiFi.conf"
db6034
-}
db6034
-
db6034
-Define.DirectPlaybackChannels 4
db6034
-Define.DirectCaptureChannels 2
db6034
-
db6034
-Include.dhw.File "/common/direct.conf"
db6034
diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
db6034
index 90a88d4..3479ba1 100644
db6034
--- a/ucm2/USB-Audio/USB-Audio.conf
db6034
+++ b/ucm2/USB-Audio/USB-Audio.conf
db6034
@@ -135,14 +135,14 @@ If.goxlr {
db6034
 	True.Define.ProfileName "GoXLR/GoXLR"
db6034
 }
db6034
 
db6034
-If.focusrite-scarlett-2i4-gen2 {
db6034
+If.focusrite-scarlett-2i-gen2 {
db6034
 	Condition {
db6034
-		Type String
db6034
-		Haystack "${CardComponents}"
db6034
-		Needle "USB1235:8200"
db6034
+		Type RegexMatch
db6034
+		String "${CardComponents}"
db6034
+		Regex "USB1235:820[02]"
db6034
 	}
db6034
 	True.Define {
db6034
-		ProfileName "Focusrite/Scarlett-2i4-gen2"
db6034
+		ProfileName "Focusrite/Scarlett-2i-gen2"
db6034
 	}
db6034
 }
db6034
 
db6034
-- 
db6034
2.39.0
db6034
db6034
db6034
From b50a903f488e3f6479001b603c1b42b2a9600882 Mon Sep 17 00:00:00 2001
db6034
From: Manu Linares <mbarriolinares@gmail.com>
db6034
Date: Sat, 5 Nov 2022 19:32:27 -0300
db6034
Subject: [PATCH 04/21] ucm2: USB-Audio - Added Digidesign Mbox 3 support
db6034
db6034
Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/237
db6034
Signed-off-by: Manu Linares <mbarriolinares@gmail.com>
db6034
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
db6034
---
db6034
 .../Digidesign/Digidesign-Mbox-3-HiFi.conf    | 126 ++++++++++++++++++
db6034
 .../Digidesign/Digidesign-Mbox-3.conf         |  11 ++
db6034
 ucm2/USB-Audio/USB-Audio.conf                 |   9 ++
db6034
 3 files changed, 146 insertions(+)
db6034
 create mode 100644 ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3-HiFi.conf
db6034
 create mode 100644 ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3.conf
db6034
db6034
diff --git a/ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3-HiFi.conf b/ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3-HiFi.conf
db6034
new file mode 100644
db6034
index 0000000..7219bea
db6034
--- /dev/null
db6034
+++ b/ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3-HiFi.conf
db6034
@@ -0,0 +1,126 @@
db6034
+Include.pcm_split.File "/common/pcm/split.conf"
db6034
+
db6034
+Macro [
db6034
+	{
db6034
+		SplitPCM {
db6034
+			Name "mbox3_stereo_out"
db6034
+			Direction Playback
db6034
+			Channels 2
db6034
+			HWChannels 4
db6034
+			HWChannelPos0 FL
db6034
+			HWChannelPos1 FR
db6034
+			HWChannelPos2 FL
db6034
+			HWChannelPos3 FR
db6034
+		}
db6034
+	}
db6034
+	{
db6034
+		SplitPCM {
db6034
+			Name "mbox3_stereo_in"
db6034
+			Direction Capture
db6034
+			Channels 2
db6034
+			HWChannels 4
db6034
+			HWChannelPos0 FL
db6034
+			HWChannelPos1 FR
db6034
+			HWChannelPos2 FL
db6034
+			HWChannelPos3 FR
db6034
+		}
db6034
+	}
db6034
+	{
db6034
+		SplitPCM {
db6034
+			Name "mbox3_mono_in"
db6034
+			Direction Capture
db6034
+			Channels 1
db6034
+			HWChannels 4
db6034
+			HWChannelPos0 MONO
db6034
+			HWChannelPos1 MONO
db6034
+			HWChannelPos2 MONO
db6034
+			HWChannelPos3 MONO
db6034
+		}
db6034
+	}
db6034
+]
db6034
+
db6034
+SectionDevice."Line1" {
db6034
+	Comment "Main Output L/R"
db6034
+
db6034
+	Value {
db6034
+		PlaybackPriority 300
db6034
+	}
db6034
+	Macro.pcm_split.SplitPCMDevice {
db6034
+		Name "mbox3_stereo_out"
db6034
+		Direction Playback
db6034
+		HWChannels 4
db6034
+		Channels 2
db6034
+		Channel0 0
db6034
+		Channel1 1
db6034
+		ChannelPos0 FL
db6034
+		ChannelPos1 FR
db6034
+	}
db6034
+}
db6034
+
db6034
+
db6034
+SectionDevice."line2SPDIF" {
db6034
+	Comment "SPDIF Out"
db6034
+	Value {
db6034
+		PlaybackPriority 100
db6034
+	}
db6034
+	Macro.pcm_split.SplitPCMDevice {
db6034
+		Name "mbox3_stereo_out"
db6034
+		Direction Playback
db6034
+		HWChannels 4
db6034
+		Channels 2
db6034
+		Channel0 2
db6034
+		Channel1 3
db6034
+		ChannelPos0 FL
db6034
+		ChannelPos1 FR
db6034
+	}
db6034
+}
db6034
+
db6034
+SectionDevice."mic1" {
db6034
+	Comment "Mic/Line 1"
db6034
+
db6034
+	Value {
db6034
+		CapturePriority 300
db6034
+	}
db6034
+	Macro.pcm_split.SplitPCMDevice {
db6034
+		Name "mbox3_mono_in"
db6034
+		Direction Capture
db6034
+		HWChannels 4
db6034
+		Channels 1
db6034
+		Channel0 0
db6034
+		ChannelPos0 MONO
db6034
+	}
db6034
+}
db6034
+
db6034
+SectionDevice."mic2" {
db6034
+	Comment "Mic/Line 2"
db6034
+
db6034
+	Value {
db6034
+		CapturePriority 200
db6034
+	}
db6034
+	Macro.pcm_split.SplitPCMDevice {
db6034
+		Name "mbox3_mono_in"
db6034
+		Direction Capture
db6034
+		HWChannels 4
db6034
+		Channels 1
db6034
+		Channel0 1
db6034
+		ChannelPos0 MONO
db6034
+	}
db6034
+}
db6034
+
db6034
+SectionDevice."mic3SPDIF" {
db6034
+	Comment "SPDIF In"
db6034
+
db6034
+	Value {
db6034
+		CapturePriority 100
db6034
+	}
db6034
+	Macro.pcm_split.SplitPCMDevice {
db6034
+		Name "mbox3_stereo_in"
db6034
+		Direction Capture
db6034
+		HWChannels 4
db6034
+		Channels 2
db6034
+		Channel0 2
db6034
+		Channel1 3
db6034
+		ChannelPos0 FL
db6034
+		ChannelPos1 FR
db6034
+	}
db6034
+}
db6034
diff --git a/ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3.conf b/ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3.conf
db6034
new file mode 100644
db6034
index 0000000..d6e19f9
db6034
--- /dev/null
db6034
+++ b/ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3.conf
db6034
@@ -0,0 +1,11 @@
db6034
+Comment "Digidesign Mbox 3"
db6034
+
db6034
+SectionUseCase."Mixer" {
db6034
+	Comment "Stereo Duplex"
db6034
+	File "/USB-Audio/Digidesign/Digidesign-Mbox-3-HiFi.conf"
db6034
+}
db6034
+
db6034
+Define.DirectPlaybackChannels 4
db6034
+Define.DirectCaptureChannels 4
db6034
+
db6034
+Include.dhw.File "/common/direct.conf"
db6034
diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
db6034
index 3479ba1..d1d70d8 100644
db6034
--- a/ucm2/USB-Audio/USB-Audio.conf
db6034
+++ b/ucm2/USB-Audio/USB-Audio.conf
db6034
@@ -126,6 +126,15 @@ If.dell-desktop-rear {
db6034
 	True.Define.ProfileName "Dell/Desktop-Rear"
db6034
 }
db6034
 
db6034
+If.mbox3 {
db6034
+	Condition {
db6034
+		Type String
db6034
+		Haystack "${CardComponents}"
db6034
+		Needle "USB0dba:5000"
db6034
+	}
db6034
+	True.Define.ProfileName "Digidesign/Digidesign-Mbox-3"
db6034
+}
db6034
+
db6034
 If.goxlr {
db6034
 	Condition {
db6034
 		Type RegexMatch
db6034
-- 
db6034
2.39.0
db6034
db6034
db6034
From 88f232dffd54e1b9222ea76c7885445efebaa74d Mon Sep 17 00:00:00 2001
db6034
From: "Ben Scholzen (DASPRiD)" <mail@dasprids.de>
db6034
Date: Mon, 31 Oct 2022 17:41:02 +0100
db6034
Subject: [PATCH 05/21] ucm2: Alc4080 - add support for ASUS ROG Strix Z790-E
db6034
 Gaming Wifi
db6034
db6034
Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/235
db6034
Signed-off-by: Ben Scholzen (DASPRiD) <mail@dasprids.de>
db6034
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
db6034
---
db6034
 ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf | 2 +-
db6034
 ucm2/USB-Audio/USB-Audio.conf            | 3 ++-
db6034
 2 files changed, 3 insertions(+), 2 deletions(-)
db6034
db6034
diff --git a/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf b/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf
db6034
index 519f3b0..fa8d445 100644
db6034
--- a/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf
db6034
+++ b/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf
db6034
@@ -68,7 +68,7 @@ If.spdif_dev2 {
db6034
 	Condition {
db6034
 		Type RegexMatch
db6034
 		String "${CardComponents}"
db6034
-		Regex "USB(0b05:1996|0db0:1feb)"
db6034
+		Regex "USB(0b05:1996|0b05:1a52|0db0:1feb)"
db6034
 	}
db6034
 	True.Define.SpdifPCM "hw:${CardId},2"
db6034
 }
db6034
diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
db6034
index d1d70d8..e30dc2b 100644
db6034
--- a/ucm2/USB-Audio/USB-Audio.conf
db6034
+++ b/ucm2/USB-Audio/USB-Audio.conf
db6034
@@ -41,6 +41,7 @@ If.realtek-alc4080 {
db6034
 		# 0b05:1a16 ASUS ROG Strix B660-F Gaming WiFi
db6034
 		# 0b05:1a20 ASUS ROG STRIX Z690-I Gaming Wifi
db6034
 		# 0b05:1a27 ALC4082 on ASUS ROG Maximus Z690 Hero
db6034
+		# 0b05:1a52 ASUS ROG Strix Z790-E Gaming Wifi
db6034
 		# 0db0:005a MSI MPG Z690 CARBON WIFI
db6034
 		# 0db0:151f MSI X570S EDGE MAX WIFI
db6034
 		# 0db0:1feb MSI Edge Wifi Z690
db6034
@@ -50,7 +51,7 @@ If.realtek-alc4080 {
db6034
 		# 0db0:a47c MSI MEG X570S Ace Max
db6034
 		# 0db0:b202 MSI MAG Z690 Tomahawk Wifi
db6034
 		# 0db0:d6e7 MSI MPG X670E Carbon Wifi
db6034
-		Regex "USB((0414:a00e)|(0b05:(1996|1a(16|2[07])))|(0db0:(005a|151f|1feb|419c|82c7|a073|a47c|b202|d6e7)))"
db6034
+		Regex "USB((0414:a00e)|(0b05:(1996|1a(16|2[07]|52)))|(0db0:(005a|151f|1feb|419c|82c7|a073|a47c|b202|d6e7)))"
db6034
 	}
db6034
 	True.Define.ProfileName "Realtek/ALC4080"
db6034
 }
db6034
-- 
db6034
2.39.0
db6034
db6034
db6034
From b121b63f30c24e89beec506ae1d2bac9ebb3cc61 Mon Sep 17 00:00:00 2001
db6034
From: Jaroslav Kysela <perex@perex.cz>
db6034
Date: Tue, 15 Nov 2022 17:49:13 +0100
db6034
Subject: [PATCH 06/21] USB-Audio: ALC4080 - add 0db0:6cc9 MSI MPG Z590 Gaming
db6034
 Plus device
db6034
db6034
BugLink: https://github.com/alsa-project/alsa-ucm-conf/issues/241
db6034
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
db6034
---
db6034
 ucm2/USB-Audio/USB-Audio.conf | 3 ++-
db6034
 1 file changed, 2 insertions(+), 1 deletion(-)
db6034
db6034
diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
db6034
index e30dc2b..89482cb 100644
db6034
--- a/ucm2/USB-Audio/USB-Audio.conf
db6034
+++ b/ucm2/USB-Audio/USB-Audio.conf
db6034
@@ -46,12 +46,13 @@ If.realtek-alc4080 {
db6034
 		# 0db0:151f MSI X570S EDGE MAX WIFI
db6034
 		# 0db0:1feb MSI Edge Wifi Z690
db6034
 		# 0db0:419c MSI MPG X570S Carbon Max Wifi
db6034
+		# 0db0:6cc9 MSI MPG Z590 Gaming Plus
db6034
 		# 0db0:82c7 MSI MEG Z690I Unify
db6034
 		# 0db0:a073 MSI MAG X570S Torpedo Max
db6034
 		# 0db0:a47c MSI MEG X570S Ace Max
db6034
 		# 0db0:b202 MSI MAG Z690 Tomahawk Wifi
db6034
 		# 0db0:d6e7 MSI MPG X670E Carbon Wifi
db6034
-		Regex "USB((0414:a00e)|(0b05:(1996|1a(16|2[07]|52)))|(0db0:(005a|151f|1feb|419c|82c7|a073|a47c|b202|d6e7)))"
db6034
+		Regex "USB((0414:a00e)|(0b05:(1996|1a(16|2[07]|52)))|(0db0:(005a|151f|1feb|419c|6cc9|82c7|a073|a47c|b202|d6e7)))"
db6034
 	}
db6034
 	True.Define.ProfileName "Realtek/ALC4080"
db6034
 }
db6034
-- 
db6034
2.39.0
db6034
db6034
db6034
From c82c400fb653292bbf0570e278d60e1ba14cc341 Mon Sep 17 00:00:00 2001
db6034
From: Shuming Fan <shumingf@realtek.com>
db6034
Date: Wed, 16 Nov 2022 17:36:51 +0800
db6034
Subject: [PATCH 07/21] ucm2: sof-soundwire: add basic settings for RT1318 SDCA
db6034
 device
db6034
db6034
Add support for rt1318 amplifier
db6034
db6034
Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/242
db6034
Signed-off-by: Shuming Fan <shumingf@realtek.com>
db6034
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
db6034
---
db6034
 ucm2/sof-soundwire/rt1318-1.conf | 20 ++++++++++++++++++++
db6034
 ucm2/sof-soundwire/rt1318-2.conf | 25 +++++++++++++++++++++++++
db6034
 2 files changed, 45 insertions(+)
db6034
 create mode 100644 ucm2/sof-soundwire/rt1318-1.conf
db6034
 create mode 100644 ucm2/sof-soundwire/rt1318-2.conf
db6034
db6034
diff --git a/ucm2/sof-soundwire/rt1318-1.conf b/ucm2/sof-soundwire/rt1318-1.conf
db6034
new file mode 100644
db6034
index 0000000..13d77e1
db6034
--- /dev/null
db6034
+++ b/ucm2/sof-soundwire/rt1318-1.conf
db6034
@@ -0,0 +1,20 @@
db6034
+# Use case Configuration for sof-soundwire card
db6034
+
db6034
+SectionDevice."Speaker" {
db6034
+	Comment	"Speaker"
db6034
+
db6034
+	EnableSequence [
db6034
+		cset "name='rt1318-1 DAC Switch' 1"
db6034
+		cset "name='Speaker Switch' on"
db6034
+	]
db6034
+
db6034
+	DisableSequence [
db6034
+		cset "name='rt1318-1 DAC Switch' 0"
db6034
+		cset "name='Speaker Switch' off"
db6034
+	]
db6034
+
db6034
+	Value {
db6034
+	      PlaybackPriority 100
db6034
+	      PlaybackPCM "hw:${CardId},2"
db6034
+	}
db6034
+}
db6034
diff --git a/ucm2/sof-soundwire/rt1318-2.conf b/ucm2/sof-soundwire/rt1318-2.conf
db6034
new file mode 100644
db6034
index 0000000..5602470
db6034
--- /dev/null
db6034
+++ b/ucm2/sof-soundwire/rt1318-2.conf
db6034
@@ -0,0 +1,25 @@
db6034
+# Use case Configuration for sof-soundwire card
db6034
+
db6034
+SectionDevice."Speaker" {
db6034
+	Comment	"Speaker"
db6034
+
db6034
+	EnableSequence [
db6034
+		cset "name='rt1318-1 RX Channel Select' L,L"
db6034
+		cset "name='rt1318-2 RX Channel Select' R,R"
db6034
+
db6034
+		cset "name='rt1318-1 DAC Switch' 1"
db6034
+		cset "name='rt1318-2 DAC Switch' 1"
db6034
+		cset "name='Speaker Switch' on"
db6034
+	]
db6034
+
db6034
+	DisableSequence [
db6034
+		cset "name='rt1318-1 DAC Switch' 0"
db6034
+		cset "name='rt1318-2 DAC Switch' 0"
db6034
+		cset "name='Speaker Switch' off"
db6034
+	]
db6034
+
db6034
+	Value {
db6034
+	      PlaybackPriority 100
db6034
+	      PlaybackPCM "hw:${CardId},2"
db6034
+	}
db6034
+}
db6034
-- 
db6034
2.39.0
db6034
db6034
db6034
From 998849d9510754960d808e20dad4c440adaf87ef Mon Sep 17 00:00:00 2001
db6034
From: Clayton Craft <clayton@craftyguy.net>
db6034
Date: Wed, 29 Jun 2022 15:23:23 -0700
db6034
Subject: [PATCH 08/21] ucm2: add profile for the Librem 5
db6034
MIME-Version: 1.0
db6034
Content-Type: text/plain; charset=UTF-8
db6034
Content-Transfer-Encoding: 8bit
db6034
db6034
Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/181
db6034
Tested-by: Guido GĂ¼nther <agx@sigxcpu.org>
db6034
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
db6034
---
db6034
 ucm2/NXP/iMX8/Librem_5/HiFi.conf      | 151 ++++++++++++++++++++++++++
db6034
 ucm2/NXP/iMX8/Librem_5/Librem 5.conf  |  25 +++++
db6034
 ucm2/conf.d/simple-card/Librem 5.conf |   1 +
db6034
 3 files changed, 177 insertions(+)
db6034
 create mode 100644 ucm2/NXP/iMX8/Librem_5/HiFi.conf
db6034
 create mode 100644 ucm2/NXP/iMX8/Librem_5/Librem 5.conf
db6034
 create mode 120000 ucm2/conf.d/simple-card/Librem 5.conf
db6034
db6034
diff --git a/ucm2/NXP/iMX8/Librem_5/HiFi.conf b/ucm2/NXP/iMX8/Librem_5/HiFi.conf
db6034
new file mode 100644
db6034
index 0000000..55eabe3
db6034
--- /dev/null
db6034
+++ b/ucm2/NXP/iMX8/Librem_5/HiFi.conf
db6034
@@ -0,0 +1,151 @@
db6034
+SectionVerb {
db6034
+	EnableSequence [
db6034
+		disdevall ""
db6034
+	]
db6034
+
db6034
+	Value.TQ "HiFi"
db6034
+}
db6034
+
db6034
+SectionDevice."Handset" {
db6034
+	Comment "Handset"
db6034
+
db6034
+	ConflictingDevice [
db6034
+		"Headphones"
db6034
+		"Speaker"
db6034
+	]
db6034
+
db6034
+	EnableSequence [
db6034
+		cset "name='Speaker Switch' off,on"
db6034
+		cset "name='DAC L/R Swap Switch' on"
db6034
+		cset "name='DAC Monomix Switch' on"
db6034
+		cset "name='SPKOUTR PGA' DAC"
db6034
+		cset "name='Speaker Boost Volume' 2"
db6034
+	]
db6034
+
db6034
+	DisableSequence [
db6034
+		cset "name='Speaker Switch' off,off"
db6034
+		cset "name='DAC L/R Swap Switch' off"
db6034
+		cset "name='DAC Monomix Switch' off"
db6034
+		cset "name='SPKOUTR PGA' Mixer"
db6034
+	]
db6034
+
db6034
+	Value {
db6034
+		PlaybackPriority "100"
db6034
+		PlaybackVolume "name='Speaker Volume'"
db6034
+		PlaybackSwitch "name='Speaker Switch'"
db6034
+		PlaybackMixerElem "Speaker"
db6034
+		PlaybackPCM "hw:${CardId}"
db6034
+	}
db6034
+}
db6034
+
db6034
+SectionDevice."Speaker" {
db6034
+	Comment "Speaker"
db6034
+
db6034
+	ConflictingDevice [
db6034
+		"Handset"
db6034
+		"Headphones"
db6034
+	]
db6034
+
db6034
+	EnableSequence [
db6034
+		cset "name='Speaker Switch' on,off"
db6034
+		cset "name='DAC Monomix Switch' on"
db6034
+		cset "name='SPKOUTL PGA' DAC"
db6034
+		cset "name='Speaker Boost Volume' 6"
db6034
+	]
db6034
+
db6034
+	DisableSequence [
db6034
+		cset "name='Speaker Switch' off,off"
db6034
+		cset "name='DAC Monomix Switch' off"
db6034
+		cset "name='SPKOUTL PGA' Mixer"
db6034
+	]
db6034
+
db6034
+	Value {
db6034
+		PlaybackPriority "500"
db6034
+		PlaybackVolume "name='Speaker Volume'"
db6034
+		PlaybackSwitch "name='Speaker Switch'"
db6034
+		PlaybackMixerElem "Speaker"
db6034
+		PlaybackPCM "hw:${CardId}"
db6034
+	}
db6034
+}
db6034
+
db6034
+SectionDevice."Headphones" {
db6034
+	Comment "Headphones"
db6034
+
db6034
+	ConflictingDevice [
db6034
+		"Handset"
db6034
+		"Speaker"
db6034
+	]
db6034
+
db6034
+	EnableSequence [
db6034
+		cset "name='Headphone Switch' on,on"
db6034
+		cset "name='HPOUTL PGA' 0 unmute"
db6034
+		cset "name='HPOUTR PGA' 0 unmute"
db6034
+	]
db6034
+
db6034
+	DisableSequence [
db6034
+		cset "name='Headphone Switch' off off"
db6034
+		cset "name='HPOUTL PGA' 0 mute"
db6034
+		cset "name='HPOUTR PGA' 0 mute"
db6034
+	]
db6034
+
db6034
+	Value {
db6034
+		PlaybackPriority "1000"
db6034
+		PlaybackVolume "name='Headphone Volume'"
db6034
+		PlaybackSwitch "name='Headphone Switch'"
db6034
+		PlaybackMixerElem "Headphone"
db6034
+		PlaybackPCM "hw:${CardId}"
db6034
+		JackControl "Headphones Jack"
db6034
+	}
db6034
+}
db6034
+
db6034
+SectionDevice."Mic" {
db6034
+	Comment "Internal Microphone"
db6034
+
db6034
+	ConflictingDevice [
db6034
+		"Headset"
db6034
+	]
db6034
+
db6034
+	EnableSequence [
db6034
+		cset "name='ADC L/R Swap Switch' on"
db6034
+		cset "name='Input Mode' Digital"
db6034
+	]
db6034
+
db6034
+	DisableSequence [
db6034
+		cset "name='ADC L/R Swap Switch' off"
db6034
+	]
db6034
+
db6034
+	Value {
db6034
+		CapturePriority "500"
db6034
+		CaptureVolume "name='Digital Capture Volume'"
db6034
+		CaptureMixerElem "Digital"
db6034
+		CapturePCM "hw:${CardId}"
db6034
+	}
db6034
+}
db6034
+
db6034
+SectionDevice."Headset" {
db6034
+	Comment "Headset Microphone"
db6034
+
db6034
+	ConflictingDevice [
db6034
+		"Mic"
db6034
+	]
db6034
+
db6034
+	EnableSequence [
db6034
+		cset "name='Input Mode' Analog"
db6034
+		cset "name='MIXINR PGA Switch' on,on"
db6034
+		cset "name='Capture Switch' on,on"
db6034
+	]
db6034
+
db6034
+	DisableSequence [
db6034
+		cset "name='Capture Switch' off,off"
db6034
+		cset "name='MIXINR PGA Switch' off,off"
db6034
+		cset "name='Input Mode' Digital"
db6034
+	]
db6034
+
db6034
+	Value {
db6034
+		CapturePriority "100"
db6034
+		CaptureVolume "name='Capture Volume'"
db6034
+		CaptureMixerElem "Capture"
db6034
+		CapturePCM "hw:${CardId}"
db6034
+		JackControl "Headphones Jack"
db6034
+	}
db6034
+}
db6034
diff --git a/ucm2/NXP/iMX8/Librem_5/Librem 5.conf b/ucm2/NXP/iMX8/Librem_5/Librem 5.conf
db6034
new file mode 100644
db6034
index 0000000..4d7dbd6
db6034
--- /dev/null
db6034
+++ b/ucm2/NXP/iMX8/Librem_5/Librem 5.conf	
db6034
@@ -0,0 +1,25 @@
db6034
+Syntax 2
db6034
+
db6034
+SectionUseCase."HiFi" {
db6034
+	File "HiFi.conf"
db6034
+	Comment "Default"
db6034
+}
db6034
+
db6034
+BootSequence [
db6034
+	cset "name='Digital Playback Volume' 100,100"
db6034
+	cset "name='MIXINL IN2L Switch' off"
db6034
+	cset "name='MIXINL IN3L Switch' off"
db6034
+	cset "name='MIXINR IN2R Switch' off"
db6034
+	cset "name='MIXINR IN3R Switch' off"
db6034
+	cset "name='INPGAR IN1R Switch' off"
db6034
+	cset "name='INPGAR IN2R Switch' off"
db6034
+	cset "name='INPGAR IN3R Switch' on"
db6034
+	cset "name='INPGAR IN4R Switch' off"
db6034
+	cset "name='INPGAL IN1L Switch' off"
db6034
+	cset "name='INPGAL IN2L Switch' off"
db6034
+	cset "name='INPGAL IN3L Switch' off"
db6034
+	cset "name='INPGAL IN4L Switch' off"
db6034
+	cset "name='Input Mixer Switch' off,on"
db6034
+	cset "name='SPKOUTL PGA' Mixer"
db6034
+	cset "name='SPKOUTR PGA' Mixer"
db6034
+]
db6034
diff --git a/ucm2/conf.d/simple-card/Librem 5.conf b/ucm2/conf.d/simple-card/Librem 5.conf
db6034
new file mode 120000
db6034
index 0000000..c687942
db6034
--- /dev/null
db6034
+++ b/ucm2/conf.d/simple-card/Librem 5.conf	
db6034
@@ -0,0 +1 @@
db6034
+../../NXP/iMX8/Librem_5/Librem 5.conf
db6034
\ No newline at end of file
db6034
-- 
db6034
2.39.0
db6034
db6034
db6034
From 71ff24cdd2e0fecb71c2fcf8a45a1ae50233c34b Mon Sep 17 00:00:00 2001
db6034
From: Jaroslav Kysela <perex@perex.cz>
db6034
Date: Mon, 21 Nov 2022 09:51:54 +0100
db6034
Subject: [PATCH 09/21] USB-Audio: allow to configure period size for PCM split
db6034
MIME-Version: 1.0
db6034
Content-Type: text/plain; charset=UTF-8
db6034
Content-Transfer-Encoding: 8bit
db6034
db6034
The environment variable UCM_USB_PERIOD_TIME (microseconds / μs)
db6034
can define the period size for the PCM channel split over
db6034
the default value 10000μs.
db6034
db6034
BugLink: https://github.com/alsa-project/alsa-ucm-conf/pull/240
db6034
Fixes: https://github.com/alsa-project/alsa-ucm-conf/issues/238
db6034
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
db6034
---
db6034
 ucm2/USB-Audio/USB-Audio.conf | 8 ++++++++
db6034
 1 file changed, 8 insertions(+)
db6034
db6034
diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
db6034
index 89482cb..fdc29ec 100644
db6034
--- a/ucm2/USB-Audio/USB-Audio.conf
db6034
+++ b/ucm2/USB-Audio/USB-Audio.conf
db6034
@@ -4,6 +4,14 @@ Define.ProfileName ""
db6034
 Define.MixerRemap ""
db6034
 Define.SplitPCMPeriodTime 10000		# 10ms
db6034
 
db6034
+If.env1 {
db6034
+	Condition {
db6034
+		Type String
db6034
+		Empty "${env:UCM_USB_PERIOD_TIME}"
db6034
+	}
db6034
+	False.Define.SplitPCMPeriodTime "${env:UCM_USB_PERIOD_TIME}"
db6034
+}
db6034
+
db6034
 If.linked {
db6034
 	Condition {
db6034
 		Type RegexMatch
db6034
-- 
db6034
2.39.0
db6034
db6034
db6034
From 445c079665979802d50b237fe5a55be82ffd0bd9 Mon Sep 17 00:00:00 2001
db6034
From: Fadwa Chiby <fchiby@baylibre.com>
db6034
Date: Fri, 22 Jul 2022 09:45:07 +0000
db6034
Subject: [PATCH 10/21] mt8195-demo: fix soundcard initialization
db6034
db6034
The previous initialization in Bootsequence set all Switch
db6034
to off after boot.
db6034
db6034
So remove the setting off of the Switch in the BootSequence
db6034
and define Enable/DisableSequence in verb section for
db6034
a proper setting.
db6034
db6034
Note that the controls enable access to the PCM devices
db6034
(controls routes between Front End and Back End in ASoC).
db6034
db6034
Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/211
db6034
Signed-off-by: Fadwa Chiby <fchiby@baylibre.com>
db6034
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
db6034
---
db6034
 ucm2/MediaTek/mt8195_demo/HiFi.conf        | 57 ++++++++++++++++++++++
db6034
 ucm2/MediaTek/mt8195_demo/mt8195_demo.conf | 36 ++++----------
db6034
 2 files changed, 66 insertions(+), 27 deletions(-)
db6034
db6034
diff --git a/ucm2/MediaTek/mt8195_demo/HiFi.conf b/ucm2/MediaTek/mt8195_demo/HiFi.conf
db6034
index 95f2b51..660b4ad 100644
db6034
--- a/ucm2/MediaTek/mt8195_demo/HiFi.conf
db6034
+++ b/ucm2/MediaTek/mt8195_demo/HiFi.conf
db6034
@@ -1,3 +1,60 @@
db6034
+SectionVerb {
db6034
+
db6034
+	EnableSequence [
db6034
+		cset "name='HDMI_OUT_MUX' Connect"
db6034
+		cset "name='DPTX_OUT_MUX' Connect"
db6034
+		cset "name='O176 I070 Switch' on"
db6034
+		cset "name='O177 I071 Switch' on"
db6034
+		cset "name='O034 I168 Switch' on"
db6034
+		cset "name='O035 I169 Switch' on"
db6034
+		cset "name='O036 I012 Switch' on"
db6034
+		cset "name='O037 I013 Switch' on"
db6034
+		cset "name='O072 I022 Switch' on"
db6034
+		cset "name='O073 I023 Switch' on"
db6034
+		cset "name='O074 I024 Switch' on"
db6034
+		cset "name='O075 I025 Switch' on"
db6034
+		cset "name='O076 I026 Switch' on"
db6034
+		cset "name='O077 I027 Switch' on"
db6034
+		cset "name='O078 I028 Switch' on"
db6034
+		cset "name='O079 I029 Switch' on"
db6034
+		cset "name='O002 I004 Switch' on"
db6034
+		cset "name='O003 I005 Switch' on"
db6034
+		cset "name='O004 I006 Switch' on"
db6034
+		cset "name='O005 I007 Switch' on"
db6034
+		cset "name='O006 I008 Switch' on"
db6034
+		cset "name='O007 I009 Switch' on"
db6034
+		cset "name='O008 I010 Switch' on"
db6034
+		cset "name='O009 I011 Switch' on"
db6034
+	]
db6034
+
db6034
+	DisableSequence [
db6034
+		cset "name='HDMI_OUT_MUX' Disconnect"
db6034
+		cset "name='DPTX_OUT_MUX' Disconnect"
db6034
+		cset "name='O176 I070 Switch' off"
db6034
+		cset "name='O177 I071 Switch' off"
db6034
+		cset "name='O034 I168 Switch' off"
db6034
+		cset "name='O035 I169 Switch' off"
db6034
+		cset "name='O036 I012 Switch' off"
db6034
+		cset "name='O037 I013 Switch' off"
db6034
+		cset "name='O072 I022 Switch' off"
db6034
+		cset "name='O073 I023 Switch' off"
db6034
+		cset "name='O074 I024 Switch' off"
db6034
+		cset "name='O075 I025 Switch' off"
db6034
+		cset "name='O076 I026 Switch' off"
db6034
+		cset "name='O077 I027 Switch' off"
db6034
+		cset "name='O078 I028 Switch' off"
db6034
+		cset "name='O079 I029 Switch' off"
db6034
+		cset "name='O002 I004 Switch' off"
db6034
+		cset "name='O003 I005 Switch' off"
db6034
+		cset "name='O004 I006 Switch' off"
db6034
+		cset "name='O005 I007 Switch' off"
db6034
+		cset "name='O006 I008 Switch' off"
db6034
+		cset "name='O007 I009 Switch' off"
db6034
+		cset "name='O008 I010 Switch' off"
db6034
+		cset "name='O009 I011 Switch' off"
db6034
+	]
db6034
+}
db6034
+
db6034
 SectionDevice."HDMI" {
db6034
 	Comment "Hdmi/DP output"
db6034
 
db6034
diff --git a/ucm2/MediaTek/mt8195_demo/mt8195_demo.conf b/ucm2/MediaTek/mt8195_demo/mt8195_demo.conf
db6034
index c23dc37..896b6dc 100644
db6034
--- a/ucm2/MediaTek/mt8195_demo/mt8195_demo.conf
db6034
+++ b/ucm2/MediaTek/mt8195_demo/mt8195_demo.conf
db6034
@@ -1,4 +1,4 @@
db6034
-Syntax 3
db6034
+Syntax 2
db6034
 
db6034
 SectionUseCase."HiFi" {
db6034
 	File "/MediaTek/mt8195_demo/HiFi.conf"
db6034
@@ -16,12 +16,12 @@ BootSequence [
db6034
 	cset "name='PGA_L_Mux' AIN1"
db6034
 	cset "name='HDMI_OUT_MUX' Connect"
db6034
 	cset "name='DPTX_OUT_MUX' Connect"
db6034
+	# we need to enable all devices before starting PA.
db6034
+	# In our driver we use PCM, which means that we have
db6034
+	# to route Front End to a BackEnd and then only we can
db6034
+	# open a device. Without linking to BE it will fail.
db6034
 	cset "name='O176 I070 Switch' on"
db6034
 	cset "name='O177 I071 Switch' on"
db6034
-	cset "name='O034 I168 Switch' on"
db6034
-	cset "name='O035 I169 Switch' on"
db6034
-	cset "name='O036 I012 Switch' on"
db6034
-	cset "name='O037 I013 Switch' on"
db6034
 	cset "name='O072 I022 Switch' on"
db6034
 	cset "name='O073 I023 Switch' on"
db6034
 	cset "name='O074 I024 Switch' on"
db6034
@@ -30,6 +30,10 @@ BootSequence [
db6034
 	cset "name='O077 I027 Switch' on"
db6034
 	cset "name='O078 I028 Switch' on"
db6034
 	cset "name='O079 I029 Switch' on"
db6034
+	cset "name='O034 I168 Switch' on"
db6034
+	cset "name='O035 I169 Switch' on"
db6034
+	cset "name='O036 I012 Switch' on"
db6034
+	cset "name='O037 I013 Switch' on"
db6034
 	cset "name='O002 I004 Switch' on"
db6034
 	cset "name='O003 I005 Switch' on"
db6034
 	cset "name='O004 I006 Switch' on"
db6034
@@ -38,26 +42,4 @@ BootSequence [
db6034
 	cset "name='O007 I009 Switch' on"
db6034
 	cset "name='O008 I010 Switch' on"
db6034
 	cset "name='O009 I011 Switch' on"
db6034
-	cset "name='O176 I070 Switch' off"
db6034
-	cset "name='O177 I071 Switch' off"
db6034
-	cset "name='O034 I168 Switch' off"
db6034
-	cset "name='O035 I169 Switch' off"
db6034
-	cset "name='O036 I012 Switch' off"
db6034
-	cset "name='O037 I013 Switch' off"
db6034
-	cset "name='O072 I022 Switch' off"
db6034
-	cset "name='O073 I023 Switch' off"
db6034
-	cset "name='O074 I024 Switch' off"
db6034
-	cset "name='O075 I025 Switch' off"
db6034
-	cset "name='O076 I026 Switch' off"
db6034
-	cset "name='O077 I027 Switch' off"
db6034
-	cset "name='O078 I028 Switch' off"
db6034
-	cset "name='O079 I029 Switch' off"
db6034
-	cset "name='O002 I004 Switch' off"
db6034
-	cset "name='O003 I005 Switch' off"
db6034
-	cset "name='O004 I006 Switch' off"
db6034
-	cset "name='O005 I007 Switch' off"
db6034
-	cset "name='O006 I008 Switch' off"
db6034
-	cset "name='O007 I009 Switch' off"
db6034
-	cset "name='O008 I010 Switch' off"
db6034
-	cset "name='O009 I011 Switch' off"
db6034
 ]
db6034
-- 
db6034
2.39.0
db6034
db6034
db6034
From 5c865236e8de9fd75c741892fd3bd2cff62d4f3f Mon Sep 17 00:00:00 2001
db6034
From: Jaroslav Kysela <perex@perex.cz>
db6034
Date: Tue, 22 Nov 2022 09:54:22 +0100
db6034
Subject: [PATCH 11/21] USB-Audio: the environment variable UCM_USB_PERIOD_TIME
db6034
 may be undefined
db6034
db6034
Fixes: 71ff24c ("USB-Audio: allow to configure period size for PCM split")
db6034
BugLink: https://github.com/alsa-project/alsa-ucm-conf/pull/240
db6034
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
db6034
---
db6034
 ucm2/USB-Audio/USB-Audio.conf | 2 +-
db6034
 1 file changed, 1 insertion(+), 1 deletion(-)
db6034
db6034
diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
db6034
index fdc29ec..1c11da9 100644
db6034
--- a/ucm2/USB-Audio/USB-Audio.conf
db6034
+++ b/ucm2/USB-Audio/USB-Audio.conf
db6034
@@ -7,7 +7,7 @@ Define.SplitPCMPeriodTime 10000		# 10ms
db6034
 If.env1 {
db6034
 	Condition {
db6034
 		Type String
db6034
-		Empty "${env:UCM_USB_PERIOD_TIME}"
db6034
+		Empty "$${env:UCM_USB_PERIOD_TIME}"
db6034
 	}
db6034
 	False.Define.SplitPCMPeriodTime "${env:UCM_USB_PERIOD_TIME}"
db6034
 }
db6034
-- 
db6034
2.39.0
db6034
db6034
db6034
From 01e37f4fb7aab57e3f0051d81f5f6e5b2f15c831 Mon Sep 17 00:00:00 2001
db6034
From: Jaroslav Kysela <perex@perex.cz>
db6034
Date: Mon, 21 Nov 2022 10:16:57 +0100
db6034
Subject: [PATCH 12/21] HDA: DualCodecs - handle S/PDIF without analog
db6034
 connections
db6034
db6034
When no analog wires are connected, the S/PDIF output cannot be
db6034
selected in pipewire. Handle this for motherboards without Speaker
db6034
UCM device.
db6034
db6034
Fixes: https://github.com/alsa-project/alsa-ucm-conf/issues/239
db6034
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
db6034
---
db6034
 ucm2/HDA/DualCodecs/HiFi.conf | 15 +++++++++++----
db6034
 1 file changed, 11 insertions(+), 4 deletions(-)
db6034
db6034
diff --git a/ucm2/HDA/DualCodecs/HiFi.conf b/ucm2/HDA/DualCodecs/HiFi.conf
db6034
index 10c9162..8c0f403 100644
db6034
--- a/ucm2/HDA/DualCodecs/HiFi.conf
db6034
+++ b/ucm2/HDA/DualCodecs/HiFi.conf
db6034
@@ -66,13 +66,20 @@ SectionDevice."Line1" {
db6034
 		}
db6034
 		True.Value.PlaybackMixerElem "Front"
db6034
 	}
db6034
-	If.1 {
db6034
+	# make S/PDIF output working when no analog jacks are connected
db6034
+	If.speaker {
db6034
 		Condition {
db6034
 			Type ControlExists
db6034
-			Control "iface=CARD,name='Line Out Front Jack'"
db6034
+			Control "name='Speaker Playback Switch'"
db6034
+		}
db6034
+		True.If.1 {
db6034
+			Condition {
db6034
+				Type ControlExists
db6034
+				Control "iface=CARD,name='Line Out Front Jack'"
db6034
+			}
db6034
+			True.Value.JackControl "Line Out Front Jack"
db6034
+			False.Value.JackControl "Line Out Jack"
db6034
 		}
db6034
-		True.Value.JackControl "Line Out Front Jack"
db6034
-		False.Value.JackControl "Line Out Jack"
db6034
 	}
db6034
 }
db6034
 
db6034
-- 
db6034
2.39.0
db6034
db6034
db6034
From 79a8ec44d3dcf097f4a4492c506cbcf338324175 Mon Sep 17 00:00:00 2001
db6034
From: Jaroslav Kysela <perex@perex.cz>
db6034
Date: Wed, 7 Dec 2022 10:18:04 +0100
db6034
Subject: [PATCH 13/21] ucm2: sof-hda-dsp: Update Mic LED settings
db6034
db6034
Users expect to turn the LED on when only internal mic is off, but
db6034
it makes sense to turn this LED when all internal inputs are off.
db6034
db6034
This configuration may be changed when the affected applications
db6034
are updated.
db6034
db6034
BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=2134824
db6034
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
db6034
---
db6034
 ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf | 12 +++++++++++-
db6034
 1 file changed, 11 insertions(+), 1 deletion(-)
db6034
db6034
diff --git a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf
db6034
index e6a8a15..9e85914 100644
db6034
--- a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf
db6034
+++ b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf
db6034
@@ -9,7 +9,17 @@ If.devdmic {
db6034
 		Haystack "${CardComponents}"
db6034
 		Needle "cfg-dmics:"
db6034
 	}
db6034
-	True.Define.DeviceDmic "Mic1"
db6034
+	True {
db6034
+		Define.DeviceDmic "Mic1"
db6034
+		FixedBootSequence [
db6034
+			#
db6034
+			# users expect to turn the LED on when only internal
db6034
+			# mic is off, but it makes sense to turn this LED
db6034
+			# when all internal inputs are off
db6034
+			#
db6034
+			sysw "-/class/sound/ctl-led/mic/card${CardNumber}/detach:Capture Switch"
db6034
+		]
db6034
+	}
db6034
 	True.Define.DeviceMic "Mic2"
db6034
 }
db6034
 
db6034
-- 
db6034
2.39.0
db6034
db6034
db6034
From 9ce9ddb4a84fb467602b716575ea1d8f2bab0c39 Mon Sep 17 00:00:00 2001
db6034
From: Jaroslav Kysela <perex@perex.cz>
db6034
Date: Wed, 7 Dec 2022 15:00:35 +0100
db6034
Subject: [PATCH 14/21] ucm2: HDA: Update Mic LED settings for ACP DMIC
db6034
db6034
Users expect to turn the LED on when only internal mic is off, but
db6034
it makes sense to turn this LED when all internal inputs are off.
db6034
db6034
This configuration may be changed when the affected applications
db6034
are updated.
db6034
db6034
BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=2134824
db6034
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
db6034
---
db6034
 ucm2/HDA/HDA.conf | 1 +
db6034
 1 file changed, 1 insertion(+)
db6034
db6034
diff --git a/ucm2/HDA/HDA.conf b/ucm2/HDA/HDA.conf
db6034
index 64ffe83..47dfc05 100644
db6034
--- a/ucm2/HDA/HDA.conf
db6034
+++ b/ucm2/HDA/HDA.conf
db6034
@@ -55,6 +55,7 @@ If.use {
db6034
 					cset-new "name='Mic ACP LED Capture Switch' type=bool,count=1 off"
db6034
 					exec "-/sbin/modprobe snd_ctl_led"
db6034
 					sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:Mic ACP LED Capture Switch"
db6034
+					sysw "-/class/sound/ctl-led/mic/card${CardNumber}/detach:Capture Switch"
db6034
 				]
db6034
 			}
db6034
 		}
db6034
-- 
db6034
2.39.0
db6034
db6034
db6034
From 3984514b25a5b2a2a09d29ad8ddbc1ad78c6a1e4 Mon Sep 17 00:00:00 2001
db6034
From: Jaroslav Kysela <perex@perex.cz>
db6034
Date: Wed, 7 Dec 2022 15:48:05 +0100
db6034
Subject: [PATCH 15/21] ucm2: sof-hda-dsp - If.devdmic cleanup
db6034
db6034
Simplify the If.devdmic block.
db6034
db6034
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
db6034
---
db6034
 ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf | 2 +-
db6034
 1 file changed, 1 insertion(+), 1 deletion(-)
db6034
db6034
diff --git a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf
db6034
index 9e85914..7ef4f24 100644
db6034
--- a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf
db6034
+++ b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf
db6034
@@ -11,6 +11,7 @@ If.devdmic {
db6034
 	}
db6034
 	True {
db6034
 		Define.DeviceDmic "Mic1"
db6034
+		Define.DeviceMic "Mic2"
db6034
 		FixedBootSequence [
db6034
 			#
db6034
 			# users expect to turn the LED on when only internal
db6034
@@ -20,7 +21,6 @@ If.devdmic {
db6034
 			sysw "-/class/sound/ctl-led/mic/card${CardNumber}/detach:Capture Switch"
db6034
 		]
db6034
 	}
db6034
-	True.Define.DeviceMic "Mic2"
db6034
 }
db6034
 
db6034
 SectionUseCase."HiFi" {
db6034
-- 
db6034
2.39.0
db6034
db6034
db6034
From e395d7b743584cba60876b6356fb3bc7834992aa Mon Sep 17 00:00:00 2001
db6034
From: Jaroslav Kysela <perex@perex.cz>
db6034
Date: Mon, 26 Dec 2022 09:20:51 +0100
db6034
Subject: [PATCH 16/21] sof-soundwire: set PGA capture switch for rt715 mic in
db6034
 BootSequence
db6034
db6034
Fixes: https://github.com/alsa-project/alsa-ucm-conf/issues/255
db6034
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
db6034
---
db6034
 ucm2/sof-soundwire/sof-soundwire.conf | 11 +++++++++++
db6034
 1 file changed, 11 insertions(+)
db6034
db6034
diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf
db6034
index 03df16c..bdc48ff 100644
db6034
--- a/ucm2/sof-soundwire/sof-soundwire.conf
db6034
+++ b/ucm2/sof-soundwire/sof-soundwire.conf
db6034
@@ -61,3 +61,14 @@ If.mic_init {
db6034
 	}
db6034
 	True.Include.mic_init.File "/codecs/${var:MicCodec1}/init.conf"
db6034
 }
db6034
+
db6034
+If.mic_init_rt715 {
db6034
+	Condition {
db6034
+		Type String
db6034
+		Needle "rt715"
db6034
+		Haystack "${var:MicCodec1}"
db6034
+	}
db6034
+	True.BootSequence [
db6034
+		cset "name='PGA5.0 5 Master Capture Switch' 1"
db6034
+	]
db6034
+}
db6034
-- 
db6034
2.39.0
db6034
db6034
db6034
From c0b9d6fb207d533d348942e02ecdc57984eb5fc3 Mon Sep 17 00:00:00 2001
db6034
From: Kai-Chuan Hsieh <kaichuan.hsieh@canonical.com>
db6034
Date: Mon, 26 Dec 2022 10:24:20 +0800
db6034
Subject: [PATCH 17/21] sof-hda-dsp: Set Dmic0 Capture Switch on
db6034
db6034
Internal micrphone default is off after fresh installation.
db6034
Add operation to set the control on to align with other architecture.
db6034
db6034
Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/259
db6034
Signed-off-by: Kai-Chuan Hsieh <kaichuan.hsieh@canonical.com>
db6034
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
db6034
---
db6034
 ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf | 1 +
db6034
 1 file changed, 1 insertion(+)
db6034
db6034
diff --git a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf
db6034
index 7ef4f24..6887938 100644
db6034
--- a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf
db6034
+++ b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf
db6034
@@ -83,6 +83,7 @@ If.dmic {
db6034
 		}
db6034
 		True.BootSequence [
db6034
 			cset "name='Dmic0 Capture Volume' 70%"
db6034
+			cset "name='Dmic0 Capture Switch' on"
db6034
 		]
db6034
 	}
db6034
 }
db6034
-- 
db6034
2.39.0
db6034
db6034
db6034
From 1923bd19c0bef947c085e2941dd8ed2d1310731e Mon Sep 17 00:00:00 2001
db6034
From: 13r0ck <brock@szu.email>
db6034
Date: Mon, 19 Dec 2022 18:08:38 -0700
db6034
Subject: [PATCH 18/21] USB-Audio: alc4080 - add MSI MAG B650I Edge WiFi (ID
db6034
 0db0:36e7)
db6034
db6034
This motherboard is recognized as the thelio-r3 by System76
db6034
db6034
Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/254
db6034
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
db6034
---
db6034
 ucm2/USB-Audio/USB-Audio.conf | 3 ++-
db6034
 1 file changed, 2 insertions(+), 1 deletion(-)
db6034
db6034
diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
db6034
index 1c11da9..6e48f98 100644
db6034
--- a/ucm2/USB-Audio/USB-Audio.conf
db6034
+++ b/ucm2/USB-Audio/USB-Audio.conf
db6034
@@ -53,6 +53,7 @@ If.realtek-alc4080 {
db6034
 		# 0db0:005a MSI MPG Z690 CARBON WIFI
db6034
 		# 0db0:151f MSI X570S EDGE MAX WIFI
db6034
 		# 0db0:1feb MSI Edge Wifi Z690
db6034
+		# 0db0:36e7 MSI MAG B650I Edge WiFi
db6034
 		# 0db0:419c MSI MPG X570S Carbon Max Wifi
db6034
 		# 0db0:6cc9 MSI MPG Z590 Gaming Plus
db6034
 		# 0db0:82c7 MSI MEG Z690I Unify
db6034
@@ -60,7 +61,7 @@ If.realtek-alc4080 {
db6034
 		# 0db0:a47c MSI MEG X570S Ace Max
db6034
 		# 0db0:b202 MSI MAG Z690 Tomahawk Wifi
db6034
 		# 0db0:d6e7 MSI MPG X670E Carbon Wifi
db6034
-		Regex "USB((0414:a00e)|(0b05:(1996|1a(16|2[07]|52)))|(0db0:(005a|151f|1feb|419c|6cc9|82c7|a073|a47c|b202|d6e7)))"
db6034
+		Regex "USB((0414:a00e)|(0b05:(1996|1a(16|2[07]|52)))|(0db0:(005a|151f|1feb|36e7|419c|6cc9|82c7|a073|a47c|b202|d6e7)))"
db6034
 	}
db6034
 	True.Define.ProfileName "Realtek/ALC4080"
db6034
 }
db6034
-- 
db6034
2.39.0
db6034
db6034
db6034
From fea43c9342dd32ab93fa71b419abb97778def5c9 Mon Sep 17 00:00:00 2001
db6034
From: Samuel Williams <samuel.williams@oriontransfer.co.nz>
db6034
Date: Sun, 11 Dec 2022 18:30:40 +1300
db6034
Subject: [PATCH 19/21] USB-Audio: ALC4080 - Add support for ASUS ROG Crosshair
db6034
 X670 Extreme (ID 0b05:1a53)
db6034
db6034
- Confirmed working.
db6034
db6034
Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/249
db6034
Signed-off-by: Samuel Williams <samuel.williams@oriontransfer.co.nz>
db6034
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
db6034
---
db6034
 ucm2/USB-Audio/USB-Audio.conf | 3 ++-
db6034
 1 file changed, 2 insertions(+), 1 deletion(-)
db6034
db6034
diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
db6034
index 6e48f98..041db9d 100644
db6034
--- a/ucm2/USB-Audio/USB-Audio.conf
db6034
+++ b/ucm2/USB-Audio/USB-Audio.conf
db6034
@@ -50,6 +50,7 @@ If.realtek-alc4080 {
db6034
 		# 0b05:1a20 ASUS ROG STRIX Z690-I Gaming Wifi
db6034
 		# 0b05:1a27 ALC4082 on ASUS ROG Maximus Z690 Hero
db6034
 		# 0b05:1a52 ASUS ROG Strix Z790-E Gaming Wifi
db6034
+		# 0b05:1a53 ALC4082 on ASUS ROG Crosshair X670E Extreme
db6034
 		# 0db0:005a MSI MPG Z690 CARBON WIFI
db6034
 		# 0db0:151f MSI X570S EDGE MAX WIFI
db6034
 		# 0db0:1feb MSI Edge Wifi Z690
db6034
@@ -61,7 +62,7 @@ If.realtek-alc4080 {
db6034
 		# 0db0:a47c MSI MEG X570S Ace Max
db6034
 		# 0db0:b202 MSI MAG Z690 Tomahawk Wifi
db6034
 		# 0db0:d6e7 MSI MPG X670E Carbon Wifi
db6034
-		Regex "USB((0414:a00e)|(0b05:(1996|1a(16|2[07]|52)))|(0db0:(005a|151f|1feb|36e7|419c|6cc9|82c7|a073|a47c|b202|d6e7)))"
db6034
+		Regex "USB((0414:a00e)|(0b05:(1996|1a(16|2[07]|5[23])))|(0db0:(005a|151f|1feb|36e7|419c|6cc9|82c7|a073|a47c|b202|d6e7)))"
db6034
 	}
db6034
 	True.Define.ProfileName "Realtek/ALC4080"
db6034
 }
db6034
-- 
db6034
2.39.0
db6034
db6034
db6034
From 12db78292676441dfea39c2d0e5db448ec740e2a Mon Sep 17 00:00:00 2001
db6034
From: Adrian Rudnik <adrian@klonmaschine.de>
db6034
Date: Thu, 8 Dec 2022 00:49:13 +0100
db6034
Subject: [PATCH 20/21] ucm2: alc4080 - add support for MSI PRO Z790-A WIFI (ID
db6034
 0db0:d1d7)
db6034
db6034
Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/248
db6034
Signed-off-by: Adrian Rudnik <adrian@klonmaschine.de>
db6034
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
db6034
---
db6034
 ucm2/USB-Audio/USB-Audio.conf | 3 ++-
db6034
 1 file changed, 2 insertions(+), 1 deletion(-)
db6034
db6034
diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
db6034
index 041db9d..da9acd0 100644
db6034
--- a/ucm2/USB-Audio/USB-Audio.conf
db6034
+++ b/ucm2/USB-Audio/USB-Audio.conf
db6034
@@ -61,8 +61,9 @@ If.realtek-alc4080 {
db6034
 		# 0db0:a073 MSI MAG X570S Torpedo Max
db6034
 		# 0db0:a47c MSI MEG X570S Ace Max
db6034
 		# 0db0:b202 MSI MAG Z690 Tomahawk Wifi
db6034
+		# 0db0:d1d7 MSI PRO Z790-A WIFI
db6034
 		# 0db0:d6e7 MSI MPG X670E Carbon Wifi
db6034
-		Regex "USB((0414:a00e)|(0b05:(1996|1a(16|2[07]|5[23])))|(0db0:(005a|151f|1feb|36e7|419c|6cc9|82c7|a073|a47c|b202|d6e7)))"
db6034
+		Regex "USB((0414:a00e)|(0b05:(1996|1a(16|2[07]|5[23])))|(0db0:(005a|151f|1feb|36e7|419c|6cc9|82c7|a073|a47c|b202|d1d7|d6e7)))"
db6034
 	}
db6034
 	True.Define.ProfileName "Realtek/ALC4080"
db6034
 }
db6034
-- 
db6034
2.39.0
db6034
db6034
db6034
From d771df0333e70cd474389bade0f52a804de7b5ea Mon Sep 17 00:00:00 2001
db6034
From: 13r0ck <bnr@tuta.io>
db6034
Date: Tue, 22 Nov 2022 15:40:50 -0700
db6034
Subject: [PATCH 21/21] Add: 0b05:1999 ASUS ROG Strix Z590-A Gaming WiFi
db6034
db6034
This model is recognized as a thelio-mira-b1 by system76
db6034
db6034
Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/247/
db6034
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
db6034
---
db6034
 ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf | 13 +++++++++++++
db6034
 ucm2/USB-Audio/USB-Audio.conf            |  3 ++-
db6034
 2 files changed, 15 insertions(+), 1 deletion(-)
db6034
db6034
diff --git a/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf b/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf
db6034
index fa8d445..868e267 100644
db6034
--- a/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf
db6034
+++ b/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf
db6034
@@ -100,6 +100,19 @@ If.msi-meg-unify {
db6034
 	}
db6034
 }
db6034
 
db6034
+If.asus-rog-strix {
db6034
+	Condition {
db6034
+		Type RegexMatch
db6034
+		String "${CardComponents}"
db6034
+		Regex "USB(0b05:1999)"
db6034
+	}
db6034
+	True.Define {
db6034
+		Line1PCM "hw:${CardId},3"
db6034
+		HeadphonesName ""
db6034
+		SpdifName ""
db6034
+	}
db6034
+}
db6034
+
db6034
 SectionVerb {
db6034
 	EnableSequence [
db6034
 		disdevall ""
db6034
diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
db6034
index da9acd0..2a27b89 100644
db6034
--- a/ucm2/USB-Audio/USB-Audio.conf
db6034
+++ b/ucm2/USB-Audio/USB-Audio.conf
db6034
@@ -46,6 +46,7 @@ If.realtek-alc4080 {
db6034
 		String "${CardComponents}"
db6034
 		# 0414:a00e Gigabyte Z590 Aorus Pro AX
db6034
 		# 0b05:1996 ASUS on multiple boards (including ASUS ROG Maximus XIII)
db6034
+		# 0b05:1999 ASUS ROG Strix Z590-A Gaming WiFi
db6034
 		# 0b05:1a16 ASUS ROG Strix B660-F Gaming WiFi
db6034
 		# 0b05:1a20 ASUS ROG STRIX Z690-I Gaming Wifi
db6034
 		# 0b05:1a27 ALC4082 on ASUS ROG Maximus Z690 Hero
db6034
@@ -63,7 +64,7 @@ If.realtek-alc4080 {
db6034
 		# 0db0:b202 MSI MAG Z690 Tomahawk Wifi
db6034
 		# 0db0:d1d7 MSI PRO Z790-A WIFI
db6034
 		# 0db0:d6e7 MSI MPG X670E Carbon Wifi
db6034
-		Regex "USB((0414:a00e)|(0b05:(1996|1a(16|2[07]|5[23])))|(0db0:(005a|151f|1feb|36e7|419c|6cc9|82c7|a073|a47c|b202|d1d7|d6e7)))"
db6034
+		Regex "USB((0414:a00e)|(0b05:(199[69]|1a(16|2[07]|5[23])))|(0db0:(005a|151f|1feb|36e7|419c|6cc9|82c7|a073|a47c|b202|d1d7|d6e7)))"
db6034
 	}
db6034
 	True.Define.ProfileName "Realtek/ALC4080"
db6034
 }
db6034
-- 
db6034
2.39.0
db6034