From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 4 Dec 2025 15:54:45 +0000 (+0100)
Subject: sof-soundwire: second fix for -sdca variants for multi-codec
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=b6004419cff74da61213133d2ae35c29dc8447f7;p=alsa-ucm-conf.git

sof-soundwire: second fix for -sdca variants for multi-codec

Example variables:

	MultiCodec1='rt713'
	HeadsetCodec1='rt713-sdca'

Suggested-by: Shuming Fan <shumingf@realtek.com>
Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/653
Fixes: d6a783d ("sof-soundwire: fix for -sdca variants for multi-codec")
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 0239c15..7f9c7dc 100644
--- a/ucm2/sof-soundwire/sof-soundwire.conf
+++ b/ucm2/sof-soundwire/sof-soundwire.conf
@@ -72,8 +72,8 @@ If.multi_init {
 If.multi_speaker {
 	Condition {
 		Type RegexMatch
-		Regex "(${var:SpeakerCodec1}(-sdca)?)"
-		String "${var:MultiCodec1}"
+		Regex "(${var:MultiCodec1}(-sdca)?)"
+		String "${var:SpeakerCodec1}"
 	}
 	True {
 		Define.SpeakerCodec1 ""
@@ -83,8 +83,8 @@ If.multi_speaker {
 If.multi_mic {
 	Condition {
 		Type RegexMatch
-		Regex "(${var:MicCodec1}(-sdca)?)"
-		String "${var:MultiCodec1}"
+		Regex "(${var:MultiCodec1}(-sdca)?)"
+		String "${var:MicCodec1}"
 	}
 	True {
 		Define.MicCodec1 ""
@@ -94,8 +94,8 @@ If.multi_mic {
 If.multi_headset {
 	Condition {
 		Type RegexMatch
-		Regex "(${var:HeadsetCodec1}(-sdca)?)"
-		String "${var:MultiCodec1}"
+		Regex "(${var:MultiCodec1}(-sdca)?)"
+		String "${var:HeadsetCodec1}"
 	}
 	True {
 		Define.HeadsetCodec1 ""