sof-soundwire: Add missing conditional for cs42l43 bridge

When adding support for cs42l43 systems without headphones updating the
bridge configuration was missed. Add the missing conditional guard on
the ConflictingDevice which would fail in systems without headphones.

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/778
Fixes: 7585f5e9671a ("ucm2: sof-soundwire: cs42l43: support UAJ-less configuration")
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/sof-soundwire/cs35l56-bridge.conf b/ucm2/sof-soundwire/cs35l56-bridge.conf
index 2e8c1c62a729d0dd3501de0fbb6d4288224b8440..577224ad10aa4ac6f0f90ba42448aff398dd4388 100644 (file)
--- a/ucm2/sof-soundwire/cs35l56-bridge.conf
+++ b/ucm2/sof-soundwire/cs35l56-bridge.conf
@@ -16,9 +16,16 @@ LibraryConfig.remap.Config {
 SectionDevice."Speaker" {
        Comment "Speaker"
 
-       ConflictingDevice [
-               "Headphones"
-       ]
+       If.hs_present {
+               Condition {
+                       Type String
+                       Haystack "${var:HeadsetCodec1}"
+                       Needle "cs42l43"
+               }
+               True.ConflictingDevice [
+                       "Headphones"
+               ]
+       }
 
        EnableSequence [
                cset "name='cs42l43 Speaker L Input 1' 'ASPRX1'"