sof-soundwire: move cs42l43-spk+cs35l56 combatibility condition before File assignment

"Patches" should go before any other operation.

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

diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf
index 62398f885fe05b997ebf5949550cac62986ce785..d9155e29c62869e816f34fb04a4858a2e8a67eaa 100644 (file)
--- a/ucm2/sof-soundwire/sof-soundwire.conf
+++ b/ucm2/sof-soundwire/sof-soundwire.conf
@@ -56,13 +56,6 @@ DefineRegex {
        }
 }
 
-# set default file variables after regex evaluation
-If.codec_default.Append.Define {
-       SpeakerCodecFile "${var:SpeakerCodec1}"
-       MicCodecFile "${var:MicCodec1}"
-       HeadsetCodecFile "${var:HeadsetCodec1}"
-}
-
 # check to keep compatibility with older kernels that have two separate spk: tags
 If.old_multi_spk {
        Condition {
@@ -73,6 +66,13 @@ If.old_multi_spk {
        True.Define.SpeakerCodec1 "cs42l43-spk+cs35l56"
 }
 
+# set default file variables after regex evaluation
+If.codec_default.Append.Define {
+       SpeakerCodecFile "${var:SpeakerCodec1}"
+       MicCodecFile "${var:MicCodec1}"
+       HeadsetCodecFile "${var:HeadsetCodec1}"
+}
+
 DefineMacro.MultiCodecInit.If.a {
        Condition {
                Type String