ucm2: sof-soundwire: Use one file for speaker codec initialization

Use macros to minimize configuration blocks.

Signed-off-by: Jaroslav Kysela <[email protected]>

ucm2/sof-soundwire/HiFi.conf

@@ -13,7 +13,7 @@ If.spkdev {
 		Type String
 		Empty "${var:SpeakerCodec1}"
 	}
-	False.Include.spkdev.File "/sof-soundwire/${var:SpeakerCodec1}-${var:SpeakerAmps1}.conf"
+	False.Include.spkdev.File "/sof-soundwire/${var:SpeakerCodec1}.conf"
 }
 
 If.micdev {

ucm2/sof-soundwire/rt1308.conf

@@ -0,0 +1,44 @@
+# Use case Configuration for sof-soundwire card
+
+#
+# Arguments:
+#   Codec - codec number (1,2 etc.)
+#   Channel - channel selection (LR, LL, RL, RR)
+#
+DefineMacro.rt1308spk {
+	EnableSequence [
+		cset cset "name='rt1308-${var:__Codec} RX Channel Select' ${var:__Channel}"
+		cset "name='rt1308-${var:__Codec} DAC L Switch' 1"
+		cset "name='rt1308-${var:__Codec} DAC R Switch' 1"
+	]
+	DisableSequence [
+		cset "name='rt1308-${var:__Codec} DAC L Switch' 0"
+		cset "name='rt1308-${var:__Codec} DAC R Switch' 0"
+	]
+}
+
+SectionDevice."Speaker" {
+	Comment	"Speaker"
+
+	Macro.num1.rt1308spk { Codec 1 Channel LL }
+
+	Condition {
+		Type String
+		Haystack "${var:SpeakerAmps1}"
+		Needle "2"
+	}
+	True.Macro.num2.rt1308spk { Codec 2 Channel RR }
+
+	EnableSequence [
+		cset "name='Speaker Switch' on"
+	]
+
+	DisableSequence [
+		cset "name='Speaker Switch' off"
+	]
+
+	Value {
+	      PlaybackPriority 100
+	      PlaybackPCM "hw:${CardId},2"
+	}
+}

ucm2/sof-soundwire/rt1316.conf

@@ -0,0 +1,63 @@
+# Use case Configuration for sof-soundwire card
+
+#
+# Arguments:
+#   Codec - codec number (1,2 etc.)
+#   Channel - channel selection (L,R;L,L;L,R;L,L+R;R,L;R,R;R,L+R;L+R,L;L+R,R;L+R,L+R)
+)
+#
+DefineMacro.rt1316spk {
+	EnableSequence [
+		cset cset "name='rt1316-${var:__Codec} RX Channel Select' ${var:__Channel}"
+	]
+	If.lrswitch {
+		Condition {
+			Type ControlExists
+			Control "name='rt1316-${var:__Codec} DAC L Switch'"
+		}
+		True {
+			EnableSequence [
+				cset "name='rt1316-${var:__Codec} DAC L Switch' 1"
+				cset "name='rt1316-${var:__Codec} DAC R Switch' 1"
+			]
+			DisableSequence [
+				cset "name='rt1316-${var:__Codec} DAC L Switch' 0"
+				cset "name='rt1316-${var:__Codec} DAC R Switch' 0"
+			]
+		}
+		False {
+			EnableSequence [
+				cset "name='rt1316-1 DAC Switch' 1"
+			]
+
+			DisableSequence [
+				cset "name='rt1316-1 DAC Switch' 0"
+			]
+		}
+	}
+}
+
+SectionDevice."Speaker" {
+	Comment	"Speaker"
+
+	Macro.num1.rt1316spk { Codec 1 Channel "L,L" }
+	Condition {
+		Type String
+		Haystack "${var:SpeakerAmps1}"
+		Needle "2"
+	}
+	True.Macro.num2.rt1316spk { Codec 2 Channel "R,R" }
+
+	EnableSequence [
+		cset "name='Speaker Switch' on"
+	]
+
+	DisableSequence [
+		cset "name='Speaker Switch' off"
+	]
+
+	Value {
+	      PlaybackPriority 100
+	      PlaybackPCM "hw:${CardId},2"
+	}
+}

ucm2/sof-soundwire/rt1318.conf

@@ -0,0 +1,42 @@
+# Use case Configuration for sof-soundwire card
+
+#
+# Arguments:
+#   Codec - codec number (1,2 etc.)
+#   Channel - channel selection (L,R;L,L;L,R;L,L+R;R,L;R,R;R,L+R;L+R,L;L+R,R;L+R,L+R)
+#
+DefineMacro.rt1318spk {
+	EnableSequence [
+		cset cset "name='rt1308-${var:__Codec} RX Channel Select' ${var:__Channel}"
+		cset "name='rt1308-${var:__Codec} DAC Switch' 1"
+	]
+	DisableSequence [
+		cset "name='rt1308-${var:__Codec} DAC Switch' 0"
+	]
+}
+
+SectionDevice."Speaker" {
+	Comment	"Speaker"
+
+	Macro.num1.rt1318spk { Codec 1 Channel "L,L" }
+
+	Condition {
+		Type String
+		Haystack "${var:SpeakerAmps1}"
+		Needle "2"
+	}
+	True.Macro.num2.rt1318spk { Codec 2 Channel "R,R" }
+
+	EnableSequence [
+		cset "name='Speaker Switch' on"
+	]
+
+	DisableSequence [
+		cset "name='Speaker Switch' off"
+	]
+
+	Value {
+	      PlaybackPriority 100
+	      PlaybackPCM "hw:${CardId},2"
+	}
+}