From b4e4b463054ed7f59e748ade295dcce93d452030 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 29 May 2020 15:48:36 +0200
Subject: [PATCH] chtmax98090: add generic chtmax98090.conf and move Quawks
 init to the generic HiFi.conf

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 ucm2/chtmax98090/GOOGLE-Quawks-1.0.conf |  6 -----
 ucm2/chtmax98090/HiFi-Quawks.conf       | 29 -------------------------
 ucm2/chtmax98090/HiFi.conf              | 15 +++++++++++++
 ucm2/chtmax98090/chtmax98090.conf       |  5 +++++
 4 files changed, 20 insertions(+), 35 deletions(-)
 delete mode 100644 ucm2/chtmax98090/GOOGLE-Quawks-1.0.conf
 delete mode 100644 ucm2/chtmax98090/HiFi-Quawks.conf
 create mode 100644 ucm2/chtmax98090/chtmax98090.conf

diff --git a/ucm2/chtmax98090/GOOGLE-Quawks-1.0.conf b/ucm2/chtmax98090/GOOGLE-Quawks-1.0.conf
deleted file mode 100644
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
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 f4a8138..e5015f7 100644
--- 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
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"
+}
-- 
2.47.1