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

The -sdca suffix should be handled like normal codec identification
for multi-codecs.

Fixes: 76c14b8 ("ucm2: sof-soundwire: support rt713vb codec")
Closes: https://github.com/alsa-project/alsa-ucm-conf/issues/639
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 851b1f128289d79fd4c261865268ed5eb2ebdbd8..0239c15fcfc7a8b4a9cc67de6b15b5f06bf457a8 100644 (file)
--- a/ucm2/sof-soundwire/sof-soundwire.conf
+++ b/ucm2/sof-soundwire/sof-soundwire.conf
@@ -50,7 +50,7 @@ DefineRegex {
                String "${CardComponents}"
        }
        MultiCodec {
-               Regex "(rt712|rt713|rt721|rt722(-sdca)?)"
+               Regex "(rt712|rt713|rt721|rt722)"
                String "${var:SpeakerCodec1} ${var:HeadsetCodec1} ${var:MicCodec1}"
        }
 }
@@ -72,7 +72,7 @@ If.multi_init {
 If.multi_speaker {
        Condition {
                Type RegexMatch
-               Regex "${var:SpeakerCodec1}"
+               Regex "(${var:SpeakerCodec1}(-sdca)?)"
                String "${var:MultiCodec1}"
        }
        True {
@@ -83,7 +83,7 @@ If.multi_speaker {
 If.multi_mic {
        Condition {
                Type RegexMatch
-               Regex "${var:MicCodec1}"
+               Regex "(${var:MicCodec1}(-sdca)?)"
                String "${var:MultiCodec1}"
        }
        True {
@@ -93,9 +93,9 @@ If.multi_mic {
 
 If.multi_headset {
        Condition {
-               Type String
-               Haystack "${var:HeadsetCodec1}"
-               Needle "${var:MultiCodec1}"
+               Type RegexMatch
+               Regex "(${var:HeadsetCodec1}(-sdca)?)"
+               String "${var:MultiCodec1}"
        }
        True {
                Define.HeadsetCodec1 ""