USB-Audio: Add support for Focusrite 4th Gen devices

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/438
Signed-off-by: Chris Lane <git@chrislane.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/USB-Audio/Focusrite/Scarlett-2i.conf b/ucm2/USB-Audio/Focusrite/Scarlett-2i.conf
index 7492e574af54e851db9528b3e58d6c84f1db1978..fa032297c8b6cee5640aac5f78bf95cac5dabfe2 100644 (file)
--- a/ucm2/USB-Audio/Focusrite/Scarlett-2i.conf
+++ b/ucm2/USB-Audio/Focusrite/Scarlett-2i.conf
@@ -55,6 +55,15 @@ If.gen3 {
        True.Define.Generation "3rd"
 }
 
+If.gen4 {
+       Condition {
+               Type RegexMatch
+               String "${CardComponents}"
+               Regex "USB1235:821[89]"
+       }
+       True.Define.Generation "4th"
+}
+
 Comment "Focusrite Scarlett ${var:Model} ${var:Generation} Gen"
 
 SectionUseCase."HiFi" {

diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
index fa147d9ce0c103d433c71dc253d95033976ea39c..7c8e5627e90bec6486643c3dbacefce52e4ffdce 100644 (file)
--- a/ucm2/USB-Audio/USB-Audio.conf
+++ b/ucm2/USB-Audio/USB-Audio.conf
@@ -267,7 +267,9 @@ If.focusrite-scarlett-2i {
                # 8205 Solo 2nd Gen
                # 8210 2i2 3rd Gen
                # 8211 Solo 3rd Gen
-               Regex "USB1235:8(0(0[6a]|1c)|2(0[025]|1[01]))"
+               # 8218 Solo 4th Gen
+               # 8219 2i2 4th Gen
+               Regex "USB1235:8(0(0[6a]|1c)|2(0[025]|1[0189]))"
        }
        True.Define {
                ProfileName "Focusrite/Scarlett-2i"