From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 14 Sep 2026 14:46:22 +0000 (+0200)
Subject: sof-soundwire: move cs42l43-spk+cs35l56 combatibility condition before File assignment
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=24e5d472d66c5a07f472fe950e0abe8977f464fa;p=alsa-ucm-conf.git

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 62398f8..d9155e2 100644
--- 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