USB-Audio: move Lenovo P620 configs to separate directory

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-HiFi.conf b/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Main-HiFi.conf
similarity index 100%
rename from ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-HiFi.conf
rename to ucm2/USB-Audio/Lenovo/ThinkStation-P620-Main-HiFi.conf

diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main.conf b/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Main.conf
similarity index 64%
rename from ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main.conf
rename to ucm2/USB-Audio/Lenovo/ThinkStation-P620-Main.conf
index 53ef729acf0386b7ce68197aaf41c4806576db02..f4d8f48d03a61740d712347a21c6f8b9e3728adb 100644 (file)
--- a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main.conf
+++ b/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Main.conf
@@ -1,6 +1,5 @@
-Syntax 2
 Comment "USB-audio on Lenovo ThinkStation P620 Main Audio"
 SectionUseCase."HiFi" {
        Comment "Default"
-       File "Lenovo-ThinkStation-P620-Main-HiFi.conf"
+       File "Lenovo/ThinkStation-P620-Main-HiFi.conf"
 }

diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-HiFi.conf b/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Rear-HiFi.conf
similarity index 100%
rename from ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-HiFi.conf
rename to ucm2/USB-Audio/Lenovo/ThinkStation-P620-Rear-HiFi.conf

diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear.conf b/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Rear.conf
similarity index 64%
rename from ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear.conf
rename to ucm2/USB-Audio/Lenovo/ThinkStation-P620-Rear.conf
index f97efcb00056130dc603070414d9ac0da470ce1e..7229c6de68ac39c3e5a571ccdb18512f943f5225 100644 (file)
--- a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear.conf
+++ b/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Rear.conf
@@ -1,6 +1,5 @@
-Syntax 2
 Comment "USB-audio on Lenovo ThinkStation P620 Rear Audio"
 SectionUseCase."HiFi" {
        Comment "Default"
-       File "Lenovo-ThinkStation-P620-Rear-HiFi.conf"
+       File "Lenovo/ThinkStation-P620-Rear-HiFi.conf"
 }

diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
index 209853fc6e2b0dc66e9b8ba5e6937fd972ea1e43..6dd7cbbec0a1fd374b25ad85962a32eebb1cfa61 100644 (file)
--- a/ucm2/USB-Audio/USB-Audio.conf
+++ b/ucm2/USB-Audio/USB-Audio.conf
@@ -57,6 +57,24 @@ If.goxlr {
        True.Define.ProfileName "GoXLR/GoXLR"
 }
 
+If.lenovo-p620-rear {
+       Condition {
+               Type String
+               Haystack "${CardComponents}"
+               Needle "USB17aa:1046"
+       }
+       True.Define.ProfileName "Lenovo/ThinkStation-P620-Rear"
+}
+
+If.lenovo-p620-main {
+       Condition {
+               Type String
+               Haystack "${CardComponents}"
+               Needle "USB17aa:104d"
+       }
+       True.Define.ProfileName "Lenovo/ThinkStation-P620-Main"
+}
+
 If.inc {
        Condition {
                Type String