Blame SOURCES/alsa-ucm-git.patch

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