From: Thomas <thomas.weisshaar@proton.me>
Date: Sun, 17 Jul 2022 22:49:10 +0000 (+0100)
Subject: USB-Audio: add MOTU M2 config
X-Git-Tag: v1.2.8~39
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=3a6acaa5090a0c5a0d29c8a4906b6a60378774e2;p=alsa-ucm-conf.git

USB-Audio: add MOTU M2 config

MOTU M2 and M4 has similiar USB ID. Use the long card name to
identify the M4 variant.

Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/191
Fixes: https://github.com/alsa-project/alsa-ucm-conf/issues/190
Signed-off-by: Thomas Weisshaar <thomas.weisshaar@proton.me>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/ucm2/USB-Audio/MOTU/M2-HiFi.conf b/ucm2/USB-Audio/MOTU/M2-HiFi.conf
new file mode 100644
index 0000000..bca8ff7
--- /dev/null
+++ b/ucm2/USB-Audio/MOTU/M2-HiFi.conf
@@ -0,0 +1,87 @@
+Include.pcm_split.File "/common/pcm/split.conf"
+
+Macro [
+	{
+		SplitPCM {
+			Name "m2_mono_in"
+			Direction Capture
+			Channels 1
+			HWChannels 2
+			HWChannelPos0 MONO
+			HWChannelPos1 MONO
+		}
+	}
+	{
+		SplitPCM {
+			Name "m2_stereo_in"
+			Direction Capture
+			Channels 2
+			HWChannels 2
+			HWChannelPos0 FL
+			HWChannelPos1 FR
+		}
+	}
+]
+
+SectionDevice."Line1" {
+	Comment "Headphone + Monitor Out"
+	Value {
+		PlaybackPriority 200
+		PlaybackPCM "hw:${CardId}"
+	}
+}
+
+SectionDevice."Mic1" {
+	Comment "Mic In 1L"
+
+	Value {
+		CapturePriority 200
+	}
+	Macro.pcm_split.SplitPCMDevice {
+		Name "m2_mono_in"
+		Direction Capture
+		HWChannels 2
+		Channels 1
+		Channel0 0
+		ChannelPos0 MONO
+	}
+}
+
+SectionDevice."Mic2" {
+	Comment "Mic In 2R"
+
+	Value {
+		CapturePriority 100
+	}
+	Macro.pcm_split.SplitPCMDevice {
+		Name "m2_mono_in"
+		Direction Capture
+		HWChannels 2
+		Channels 1
+		Channel0 1
+		ChannelPos0 MONO
+	}
+}
+
+SectionDevice."Mic3" {
+	Comment "Stereo Mic In 1L+2R"
+
+	ConflictingDevice [
+		"Mic1"
+		"Mic2"
+	]
+
+	Value {
+		CapturePriority 100
+	}
+	Macro.pcm_split.SplitPCMDevice {
+		Name "m2_stereo_in"
+		Direction Capture
+		HWChannels 2
+		Channels 2
+		Channel0 0
+		Channel1 1
+		ChannelPos0 FL
+		ChannelPos1 FR
+	}
+}
diff --git a/ucm2/USB-Audio/MOTU/M2.conf b/ucm2/USB-Audio/MOTU/M2.conf
new file mode 100644
index 0000000..9c4bc76
--- /dev/null
+++ b/ucm2/USB-Audio/MOTU/M2.conf
@@ -0,0 +1,12 @@
+Comment "MOTU M2"
+
+SectionUseCase."HiFi" {
+	Comment "Analog Stereo Outputs + Inputs"
+	File "/USB-Audio/MOTU/M2-HiFi.conf"
+}
+
+Define.DirectPlaybackChannels 2
+Define.DirectCaptureChannels 2
+
+Include.dhw.File "/common/direct.conf"
+
diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
index 1f5bf00..7d9b72b 100644
--- a/ucm2/USB-Audio/USB-Audio.conf
+++ b/ucm2/USB-Audio/USB-Audio.conf
@@ -65,13 +65,21 @@ If.steinberg-ur44 {
 	True.Define.ProfileName "Steinberg/UR44"
 }
 
-If.M4 {
+If.motu-m24 {
 	Condition {
 		Type String
 		Haystack "${CardComponents}"
 		Needle "USB07fd:000b"
 	}
-	True.Define.ProfileName "MOTU/M4"
+	True.If.M4 {
+		Condition {
+			Type String
+			Haystack "${CardLongName}"
+			Needle "MOTU M4"
+		}
+		True.Define.ProfileName "MOTU/M4"
+		False.Define.ProfileName "MOTU/M2"
+	}
 }
 
 If.dell-wd15 {