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

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

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

diff --git a/ucm2/chtrt5645/chtrt5645.conf b/ucm2/Intel/chtrt5645/chtrt5645.conf
similarity index 86%
rename from ucm2/chtrt5645/chtrt5645.conf
rename to ucm2/Intel/chtrt5645/chtrt5645.conf
index 4852768f6d577a9bc6ab0509c87095578aed65ef..babec8796139234118860ecb7b38c178575f5140 100644 (file)
--- a/ucm2/chtrt5645/chtrt5645.conf
+++ b/ucm2/Intel/chtrt5645/chtrt5645.conf
@@ -2,7 +2,7 @@ Syntax 4
 Comment "Intel SoC Audio Device"
 
 SectionUseCase."HiFi" {
-       File "HiFi.conf"
+       File "/Intel/chtrt5645/HiFi.conf"
        Comment "Default"
 }
 

diff --git a/ucm2/SOF/HiFi.conf b/ucm2/SOF/HiFi.conf
index ff4b8755c46a5447567ec123586bc1bbd737459f..95c69229f9d5124bd9899528189bc53d93a3b1de 100644 (file)
--- a/ucm2/SOF/HiFi.conf
+++ b/ucm2/SOF/HiFi.conf
@@ -66,7 +66,7 @@ If.bytcht_rt5645 {
        }
        True {
                Include.init.File "/codecs/rt5645/init.conf"
-               Include.main.File "/chtrt5645/HiFi.conf"
+               Include.main.File "/Intel/chtrt5645/HiFi.conf"
        }
 }
 

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