chtmax98090: add generic chtmax98090.conf and move Quawks init to the generic HiFi...

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

diff --git a/ucm2/chtmax98090/GOOGLE-Quawks-1.0.conf b/ucm2/chtmax98090/GOOGLE-Quawks-1.0.conf
deleted file mode 100644 (file)
index 850897f..0000000
--- a/ucm2/chtmax98090/GOOGLE-Quawks-1.0.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Syntax 2
-Comment "ASUS C300 built-in audio"
-SectionUseCase."HiFi" {
-       File "HiFi-Quawks.conf"
-       Comment "Default"
-}

diff --git a/ucm2/chtmax98090/HiFi-Quawks.conf b/ucm2/chtmax98090/HiFi-Quawks.conf
deleted file mode 100644 (file)
index 363233d..0000000
--- a/ucm2/chtmax98090/HiFi-Quawks.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-SectionVerb {
-       Value {
-               TQ "HiFi"
-       }
-
-       If.platform {
-               Condition {
-                       Type ControlExists
-                       Control "name='media0_in Gain 0 Switch'"
-               }
-               True {
-                       EnableSequence [
-                               <platforms/bytcr/PlatformEnableSeq.conf>
-                       ]
-               }
-       }
-
-       EnableSequence [
-               <codecs/max98090/EnableSeq.conf>
-               # volume values modified
-               cset "name='Headphone Volume' 25"
-               cset "name='Speaker Volume' 32"
-       ]
-}
-
-<codecs/max98090/Headphones.conf>
-<codecs/max98090/Speaker.conf>
-<codecs/max98090/InternalMic.conf>
-<codecs/max98090/HeadsetMic.conf>

diff --git a/ucm2/chtmax98090/HiFi.conf b/ucm2/chtmax98090/HiFi.conf
index f4a81386040a386bee89f35b5d6c59a88a58a491..e5015f710c7888c27d2a68bb0d2f795e1d1d8fbe 100644 (file)
--- a/ucm2/chtmax98090/HiFi.conf
+++ b/ucm2/chtmax98090/HiFi.conf
@@ -18,6 +18,21 @@ SectionVerb {
        EnableSequence [
                <codecs/max98090/EnableSeq.conf>
        ]
+
+       If.Quawks {
+               Condition {
+                       Type String
+                       Haystack "${CardLongName}"
+                       Needle "GOOGLE-Quawks-1.0"
+               }
+               True {
+                       EnableSequence [
+                               # volume values modified
+                               cset "name='Headphone Volume' 25"
+                               cset "name='Speaker Volume' 32"
+                       ]
+               }
+       }
 }
 
 <codecs/max98090/Headphones.conf>

diff --git a/ucm2/chtmax98090/chtmax98090.conf b/ucm2/chtmax98090/chtmax98090.conf
new file mode 100644 (file)
index 0000000..84f7a1c
--- /dev/null
+++ b/ucm2/chtmax98090/chtmax98090.conf
@@ -0,0 +1,5 @@
+Syntax 2
+SectionUseCase."HiFi" {
+       File "HiFi.conf"
+       Comment "Play HiFi quality Music"
+}