From: Charles Keepax <ckeepax@opensource.cirrus.com>
Date: Thu, 4 Jun 2026 10:40:16 +0000 (+0100)
Subject: sof-soundwire: Add missing conditional for cs42l43 bridge
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=5d03f3c3e5d7e16555732c4e1c2e7293e227d2b4;p=alsa-ucm-conf.git

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 2e8c1c6..577224a 100644
--- 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'"