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 0239c15fcfc7a8b4a9cc67de6b15b5f06bf457a8..7f9c7dcf0d8dac5c71646c1dd3995a232cea5a30 100644 (file)
--- 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 ""