ucm2: sof-soundwire: cs42l43: support UAJ-less configuration

In some cases cs42l43/cs42l43b devices can be set up without UAJ. In
this case, guard the ConflictingDevices behind a check for a cs42l43's
headset's presence so the UCM can still load even if the headset is
missing.

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/738
Signed-off-by: Maciej Strozek <mstrozek@opensource.cirrus.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Maciej Strozek 2026-04-06 13:59:39 +01:00 committed by Jaroslav Kysela
commit 7585f5e967
2 changed files with 20 additions and 6 deletions

View file

@ -3,9 +3,16 @@
SectionDevice."Mic" { SectionDevice."Mic" {
Comment "Microphones" Comment "Microphones"
ConflictingDevice [ If.hs_present {
"Headset" Condition {
] Type String
Haystack "${var:HeadsetCodec1}"
Needle "cs42l43"
}
True.ConflictingDevice [
"Headset"
]
}
DisableSequence [ DisableSequence [
cset "name='cs42l43 DP1TX1 Input' 'None'" cset "name='cs42l43 DP1TX1 Input' 'None'"

View file

@ -3,9 +3,16 @@
SectionDevice."Speaker" { SectionDevice."Speaker" {
Comment "Speaker" Comment "Speaker"
ConflictingDevice [ If.hs_present {
"Headphones" Condition {
] Type String
Haystack "${var:HeadsetCodec1}"
Needle "cs42l43"
}
True.ConflictingDevice [
"Headphones"
]
}
EnableSequence [ EnableSequence [
cset "name='cs42l43 Speaker L Input 1' 'DP6RX1'" cset "name='cs42l43 Speaker L Input 1' 'DP6RX1'"