bytcr-rt5640: move to /Intel/bytcr-rt5640, update conf.d

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

diff --git a/ucm2/bytcr-rt5640/HiFi-Components.conf b/ucm2/Intel/bytcr-rt5640/HiFi-Components.conf
similarity index 100%
rename from ucm2/bytcr-rt5640/HiFi-Components.conf
rename to ucm2/Intel/bytcr-rt5640/HiFi-Components.conf

diff --git a/ucm2/bytcr-rt5640/HiFi-LongName.conf b/ucm2/Intel/bytcr-rt5640/HiFi-LongName.conf
similarity index 100%
rename from ucm2/bytcr-rt5640/HiFi-LongName.conf
rename to ucm2/Intel/bytcr-rt5640/HiFi-LongName.conf

diff --git a/ucm2/bytcr-rt5640/HiFi.conf b/ucm2/Intel/bytcr-rt5640/HiFi.conf
similarity index 96%
rename from ucm2/bytcr-rt5640/HiFi.conf
rename to ucm2/Intel/bytcr-rt5640/HiFi.conf
index f7585072697a7bcbfcc7d587660ce06580c86fad..fd1906cba83973e442c1b042ff90bd12ebb3ddb9 100644 (file)
--- a/ucm2/bytcr-rt5640/HiFi.conf
+++ b/ucm2/Intel/bytcr-rt5640/HiFi.conf
@@ -32,8 +32,8 @@ If.0 {
                Haystack "${CardComponents}"
                Needle "cfg-spk:"
        }
-       True.Include.comp.File "/bytcr-rt5640/HiFi-Components.conf"
-       False.Include.long.File "/bytcr-rt5640/HiFi-LongName.conf"
+       True.Include.comp.File "/Intel/bytcr-rt5640/HiFi-Components.conf"
+       False.Include.long.File "/Intel/bytcr-rt5640/HiFi-LongName.conf"
 }
 
 SectionVerb {

diff --git a/ucm2/bytcr-rt5640/bytcr-rt5640.conf b/ucm2/Intel/bytcr-rt5640/bytcr-rt5640.conf
similarity index 92%
rename from ucm2/bytcr-rt5640/bytcr-rt5640.conf
rename to ucm2/Intel/bytcr-rt5640/bytcr-rt5640.conf
index 00b03b649c9a75d9100c4a15a5f587d2b56b7234..13a73adff972ab35d70e45b78967ea497148e322 100644 (file)
--- a/ucm2/bytcr-rt5640/bytcr-rt5640.conf
+++ b/ucm2/Intel/bytcr-rt5640/bytcr-rt5640.conf
@@ -1,7 +1,7 @@
 Syntax 4
 
 SectionUseCase."HiFi" {
-       File "HiFi.conf"
+       File "/Intel/bytcr-rt5640/HiFi.conf"
        Comment "Play HiFi quality Music"
 }
 

diff --git a/ucm2/SOF/HiFi.conf b/ucm2/SOF/HiFi.conf
index bccd378bee3e3ed17fa608c270249cfae9797581..0f81da690b49233c8bf4885b20537dd2cc476d20 100644 (file)
--- a/ucm2/SOF/HiFi.conf
+++ b/ucm2/SOF/HiFi.conf
@@ -6,7 +6,7 @@ If.bytcht_rt5640 {
        }
        True {
                Include.init.File "/codecs/rt5640/init.conf"
-               Include.main.File "/bytcr-rt5640/HiFi.conf"
+               Include.main.File "/Intel/bytcr-rt5640/HiFi.conf"
        }
 }
 

diff --git a/ucm2/conf.d/bytcr-rt5640/bytcr-rt5640.conf b/ucm2/conf.d/bytcr-rt5640/bytcr-rt5640.conf
new file mode 120000 (symlink)
index 0000000..b96aeeb
--- /dev/null
+++ b/ucm2/conf.d/bytcr-rt5640/bytcr-rt5640.conf
@@ -0,0 +1 @@
+../../Intel/bytcr-rt5640/bytcr-rt5640.conf
\ No newline at end of file