bytcr-rt5640: fix the execution order

The includes must be run _after_ defines. The Include directives
have precedence. Put everything to If compound.

Fixes: bdd05ac339 ("bytcr-rt5640: Add support for devices without speakers and/or an internal mic")
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/bytcr-rt5640/HiFi-Components.conf b/ucm2/bytcr-rt5640/HiFi-Components.conf
index a76b42d..1999717 100644 (file)
--- a/ucm2/bytcr-rt5640/HiFi-Components.conf
+++ b/ucm2/bytcr-rt5640/HiFi-Components.conf
@@ -25,7 +25,10 @@ If.mono {
        }
 }
 
-Include.hs.File "/codecs/rt5640/HeadPhones.conf"
+If.hp {
+       Condition { Type String Empty "" }
+       True.Include.hs.File "/codecs/rt5640/HeadPhones.conf"
+}
 
 If.dmic1 {
        Condition {
@@ -63,4 +66,7 @@ If.in3 {
        }
 }
 
-Include.hsmic.File "/codecs/rt5640/HeadsetMic.conf"
+If.hsmic {
+       Condition { Type String Empty "" }
+       True.Include.hsmic.File "/codecs/rt5640/HeadsetMic.conf"
+}

diff --git a/ucm2/bytcr-rt5640/HiFi-LongName.conf b/ucm2/bytcr-rt5640/HiFi-LongName.conf
index 6cb5556..34acef8 100644 (file)
--- a/ucm2/bytcr-rt5640/HiFi-LongName.conf
+++ b/ucm2/bytcr-rt5640/HiFi-LongName.conf
@@ -25,7 +25,10 @@ If.mono {
        }
 }
 
-Include.hs.File "/codecs/rt5640/HeadPhones.conf"
+If.hp {
+       Condition { Type String Empty "" }
+       True.Include.hs.File "/codecs/rt5640/HeadPhones.conf"
+}
 
 If.dmic1 {
        Condition {
@@ -63,4 +66,7 @@ If.in3 {
        }
 }
 
-Include.hsmic.File "/codecs/rt5640/HeadsetMic.conf"
+If.hsmic {
+       Condition { Type String Empty "" }
+       True.Include.hsmic.File "/codecs/rt5640/HeadsetMic.conf"
+}