chtrt5650: move to /Intel/chtrt5650, update conf.d

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

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

diff --git a/ucm2/chtrt5650/chtrt5650.conf b/ucm2/Intel/chtrt5650/chtrt5650.conf
similarity index 71%
rename from ucm2/chtrt5650/chtrt5650.conf
rename to ucm2/Intel/chtrt5650/chtrt5650.conf
index 41c6d6bf824037a77153b5d27880c7f6fde228f8..cd2f962e3958640a98f36aef824a62c0dd58bc1a 100644 (file)
--- a/ucm2/chtrt5650/chtrt5650.conf
+++ b/ucm2/Intel/chtrt5650/chtrt5650.conf
@@ -1,6 +1,6 @@
 Comment "Intel SoC Audio Device"
 Syntax 3
 SectionUseCase."HiFi" {
-       File "HiFi.conf"
+       File "/Intel/chtrt5650/HiFi.conf"
        Comment "Default"
 }

diff --git a/ucm2/SOF/HiFi.conf b/ucm2/SOF/HiFi.conf
index 95c69229f9d5124bd9899528189bc53d93a3b1de..a4ff5181fa83a06ca4ddfa954bf10bf158af26da 100644 (file)
--- a/ucm2/SOF/HiFi.conf
+++ b/ucm2/SOF/HiFi.conf
@@ -76,7 +76,7 @@ If.bytcht_rt5650 {
                Haystack "${CardName}"
                Needle "bytcht rt5650"
        }
-       True.Include.main.File "/chtrt5650/HiFi.conf"
+       True.Include.main.File "/Intel/chtrt5650/HiFi.conf"
 }
 
 If.bytcht_max98090 {

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