chtnau8824: merge all possible configurations to HiFi.conf

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

diff --git a/ucm2/chtnau8824/HiFi-mono.conf b/ucm2/chtnau8824/HiFi-mono.conf
deleted file mode 100644 (file)
index 6d899ce..0000000
--- a/ucm2/chtnau8824/HiFi-mono.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-
-SectionVerb {
-
-       Value {
-               TQ "HiFi"
-       }
-
-       Include.e.File "/codecs/nau8824/EnableSeq.conf"
-
-       If.Controls {
-               Condition {
-                       Type ControlExists
-                       Control "name='media0_in Gain 0 Switch'"
-               }
-               Before.EnableSequence "0"
-               True {
-                       Include.pe.File "/platforms/bytcr/PlatformEnableSeq.conf"
-                       Include.pd.File "/platforms/bytcr/PlatformDisableSeq.conf"
-               }
-       }
-}
-
-Include.mspk.File "/codecs/nau8824/MonoSpeaker.conf"
-Include.hp.File "/codecs/nau8824/HeadPhones.conf"
-
-Include.mic.File "/codecs/nau8824/InternalMic.conf"
-Include.hsmic.File "/codecs/nau8824/HeadsetMic.conf"

diff --git a/ucm2/chtnau8824/HiFi.conf b/ucm2/chtnau8824/HiFi.conf
index b3c0209aa0ec9219615aa5ed124604de0d7f775c..6b7624d6e775c2e83e86e9dbfdea55ee36a29c4a 100644 (file)
--- a/ucm2/chtnau8824/HiFi.conf
+++ b/ucm2/chtnau8824/HiFi.conf
@@ -1,3 +1,15 @@
+Define.Speaker "Speaker"
+
+If.cfg-mspk {
+       Condition {
+               Type Regex
+               String "${CardLongName}"
+               Regex "(cube-i1_TF|PIPO-W2S)"
+       }
+       True {
+               Define.Speaker "MonoSpeaker"
+       }
+}
 
 SectionVerb {
 
@@ -22,7 +34,7 @@ SectionVerb {
        }
 }
 
-Include.spk.File "/codecs/nau8824/Speaker.conf"
+Include.spk.File "/codecs/nau8824/${var:Speaker}.conf"
 Include.hp.File "/codecs/nau8824/HeadPhones.conf"
 
 Include.mic.File "/codecs/nau8824/InternalMic.conf"

diff --git a/ucm2/chtnau8824/PIPO-W2S-Defaultstring-CherryTrailCR.conf b/ucm2/chtnau8824/PIPO-W2S-Defaultstring-CherryTrailCR.conf
deleted file mode 120000 (symlink)
index e3af8b6..0000000
--- a/ucm2/chtnau8824/PIPO-W2S-Defaultstring-CherryTrailCR.conf
+++ /dev/null
@@ -1 +0,0 @@
-chtnau8824-mono.conf
\ No newline at end of file

diff --git a/ucm2/chtnau8824/chtnau8824-mono.conf b/ucm2/chtnau8824/chtnau8824-mono.conf
deleted file mode 100644 (file)
index 6c498c7..0000000
--- a/ucm2/chtnau8824/chtnau8824-mono.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-Syntax 3
-
-Comment "chtnau8824 internal card"
-
-SectionUseCase."HiFi" {
-       File "HiFi-mono.conf"
-       Comment "Default"
-}

diff --git a/ucm2/chtnau8824/cube-i1_TF-Defaultstring-CherryTrailCR.conf b/ucm2/chtnau8824/cube-i1_TF-Defaultstring-CherryTrailCR.conf
deleted file mode 120000 (symlink)
index e3af8b6..0000000
--- a/ucm2/chtnau8824/cube-i1_TF-Defaultstring-CherryTrailCR.conf
+++ /dev/null
@@ -1 +0,0 @@
-chtnau8824-mono.conf
\ No newline at end of file