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>

diff --git a/ucm2/sof-soundwire/cs42l43-dmic.conf b/ucm2/sof-soundwire/cs42l43-dmic.conf
index c0b622cddfe193c8a4716762fcdd45eaab6b1fc2..0bada328666b9992a0b4a5b538a45fd9d693ed22 100644 (file)
--- a/ucm2/sof-soundwire/cs42l43-dmic.conf
+++ b/ucm2/sof-soundwire/cs42l43-dmic.conf
@@ -3,9 +3,16 @@
 SectionDevice."Mic" {
        Comment "Microphones"
 
-       ConflictingDevice [
-               "Headset"
-       ]
+       If.hs_present {
+               Condition {
+                       Type String
+                       Haystack "${var:HeadsetCodec1}"
+                       Needle "cs42l43"
+               }
+               True.ConflictingDevice [
+                       "Headset"
+               ]
+       }
 
        DisableSequence [
                cset "name='cs42l43 DP1TX1 Input' 'None'"

diff --git a/ucm2/sof-soundwire/cs42l43-spk.conf b/ucm2/sof-soundwire/cs42l43-spk.conf
index 48efa510c00160ec74b91aa6db9b0d829946c863..1d09f6ce268b7ea1e3d14154bcd0d356b004fa98 100644 (file)
--- a/ucm2/sof-soundwire/cs42l43-spk.conf
+++ b/ucm2/sof-soundwire/cs42l43-spk.conf
@@ -3,9 +3,16 @@
 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' 'DP6RX1'"