From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Mon, 13 Apr 2020 15:29:14 +0000 (-0500)
Subject: sof-bytcht-rt5672: reuse legacy settings
X-Git-Tag: v1.2.3~13
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=0a9672623663555f3b99fbee77b9eaf339fa1402;p=alsa-ucm-conf.git

sof-bytcht-rt5672: reuse legacy settings

Just test if controls for the legacy driver are available

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/ucm2/cht-bsw-rt5672/HiFi-stereo-dmic2.conf b/ucm2/cht-bsw-rt5672/HiFi-stereo-dmic2.conf
index 82c976b..50612aa 100644
--- a/ucm2/cht-bsw-rt5672/HiFi-stereo-dmic2.conf
+++ b/ucm2/cht-bsw-rt5672/HiFi-stereo-dmic2.conf
@@ -1,14 +1,28 @@
 # Adapted from https://github.com/plbossart/UCM/tree/master/cht-bsw-rt5672
 
 SectionVerb {
-	EnableSequence [
-		<platforms/bytcr/PlatformEnableSeq.conf>
-		<codecs/rt5672/EnableSeq.conf>
-	]
 
-	DisableSequence [
-		<platforms/bytcr/PlatformDisableSeq.conf>
-	]
+	If.Controls {
+		Condition {
+			Type ControlExists
+			Control "name='media0_in Gain 0 Switch'"
+		}
+		True {
+			EnableSequence [
+				<platforms/bytcr/PlatformEnableSeq.conf>
+				<codecs/rt5672/EnableSeq.conf>
+			]
+
+			DisableSequence [
+				<platforms/bytcr/PlatformDisableSeq.conf>
+			]
+		}
+		False {
+			EnableSequence [
+				<codecs/rt5672/EnableSeq.conf>
+			]
+		}
+	}
 }
 
 <codecs/rt5672/Speaker.conf>
diff --git a/ucm2/cht-bsw-rt5672/HiFi.conf b/ucm2/cht-bsw-rt5672/HiFi.conf
index 9a64cc3..fd34452 100644
--- a/ucm2/cht-bsw-rt5672/HiFi.conf
+++ b/ucm2/cht-bsw-rt5672/HiFi.conf
@@ -1,14 +1,28 @@
 # Adapted from https://github.com/plbossart/UCM/tree/master/cht-bsw-rt5672
 
 SectionVerb {
-	EnableSequence [
-		<platforms/bytcr/PlatformEnableSeq.conf>
-		<codecs/rt5672/EnableSeq.conf>
-	]
 
-	DisableSequence [
-		<platforms/bytcr/PlatformDisableSeq.conf>
-	]
+	If.Controls {
+		Condition {
+			Type ControlExists
+			Control "name='media0_in Gain 0 Switch'"
+		}
+		True {
+			EnableSequence [
+				<platforms/bytcr/PlatformEnableSeq.conf>
+				<codecs/rt5672/EnableSeq.conf>
+			]
+
+			DisableSequence [
+				<platforms/bytcr/PlatformDisableSeq.conf>
+			]
+		}
+		False {
+			EnableSequence [
+				<codecs/rt5672/EnableSeq.conf>
+			]
+		}
+	}
 }
 
 <codecs/rt5672/Speaker.conf>