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>
This commit is contained in:
parent
99e50c916f
commit
d6a783d329
1 changed files with 6 additions and 6 deletions
|
|
@ -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 ""
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue