topology2: sdw-jack-generic: Make BE DAI and copiers honor SDW_JACK_CAPTURE_CH

rfvirgil · rfvirgil · commit 91318ce68952 · 2026-07-24T17:05:55.000+01:00
The BE DAI, alh-copier and host-copier for capture should honor the number
of capture channels set by SDW_JACK_CAPTURE_CH.

Before this change, the value of SDW_JACK_CAPTURE_CH only affected the
min/max channels of the FE DAI but all the other objects in the pipeline
were defaulting to 2-channel. Because of this, the codec DAI was always
asked for a 2-channel capture, which won't work on codecs that only
support 1 channel. And the host-copier output was 2-channel audio that
could not be connected to the 1-channel DAI.

Signed-off-by: Richard Fitzgerald &lt;rf@opensource.cirrus.com&gt;
diff --git a/tools/topology/topology2/platform/intel/sdw-jack-generic.conf b/tools/topology/topology2/platform/intel/sdw-jack-generic.conf
@@ -38,7 +38,8 @@ Object.Dai.ALH [
 		name		$SDW_JACK_IN_STREAM
 		default_hw_conf_id	0
 		rate			$JACK_RATE
-		channels		2
+		channels		$SDW_JACK_CAPTURE_CH
+
 
 		Object.Base.hw_config.1 {
 			id	0
@@ -354,30 +355,40 @@ Object.Pipeline.host-gateway-capture [
 					Object.Base.output_audio_format [
 						{
 							out_rate		$JACK_RATE
+							out_channels		$SDW_JACK_CAPTURE_CH
 							out_bit_depth		16
 							out_valid_bit_depth	16
+							out_fmt_cfg		"$[($out_channels | ($out_valid_bit_depth * 256))]"
 						}
 						{
 							out_rate		$JACK_RATE
+							out_channels		$SDW_JACK_CAPTURE_CH
 							out_bit_depth		32
 							out_valid_bit_depth	24
+							out_fmt_cfg		"$[($out_channels | ($out_valid_bit_depth * 256))]"
 						}
 						{
 							out_rate		$JACK_RATE
+							out_channels		$SDW_JACK_CAPTURE_CH
 							out_bit_depth		32
 							out_valid_bit_depth	32
+							out_fmt_cfg		"$[($out_channels | ($out_valid_bit_depth * 256))]"
 						}
 						{
 							out_rate		$JACK_RATE
+							out_channels		$SDW_JACK_CAPTURE_CH
 							out_bit_depth		32
 							out_valid_bit_depth	32
 							out_sample_type		$SAMPLE_TYPE_FLOAT
+							out_fmt_cfg		"$[($out_channels | ($out_valid_bit_depth * 256))]"
 						}
 						{
 							out_rate		$JACK_RATE
+							out_channels		$SDW_JACK_CAPTURE_CH
 							out_bit_depth		8
 							out_valid_bit_depth	8
 							out_sample_type		$SAMPLE_TYPE_UNSIGNED_INTEGER
+							out_fmt_cfg		"$[($out_channels | ($out_valid_bit_depth * 256))]"
 						}
 					]
 				}
@@ -386,18 +397,24 @@ Object.Pipeline.host-gateway-capture [
 					Object.Base.output_audio_format [
 						{
 							out_rate		$JACK_RATE
+							out_channels		$SDW_JACK_CAPTURE_CH
 							out_bit_depth		16
 							out_valid_bit_depth	16
+							out_fmt_cfg		"$[($out_channels | ($out_valid_bit_depth * 256))]"
 						}
 						{
 							out_rate		$JACK_RATE
+							out_channels		$SDW_JACK_CAPTURE_CH
 							out_bit_depth		32
 							out_valid_bit_depth	24
+							out_fmt_cfg		"$[($out_channels | ($out_valid_bit_depth * 256))]"
 						}
 						{
 							out_rate		$JACK_RATE
+							out_channels		$SDW_JACK_CAPTURE_CH
 							out_bit_depth		32
 							out_valid_bit_depth	32
+							out_fmt_cfg		"$[($out_channels | ($out_valid_bit_depth * 256))]"
 						}
 					]
 				}
@@ -444,6 +461,7 @@ Object.Widget {
 			Object.Base.input_audio_format [
 				{
 					in_rate			$JACK_RATE
+					in_channels		$SDW_JACK_CAPTURE_CH
 					in_bit_depth		32
 					in_valid_bit_depth	$SDW_LINK_VALID_BITS
 					in_sample_type		$SAMPLE_TYPE_MSB_INTEGER

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,8 @@ Object.Dai.ALH [`
`38`	`38`	`name $SDW_JACK_IN_STREAM`
`39`	`39`	`default_hw_conf_id 0`
`40`	`40`	`rate $JACK_RATE`
`41`		`- channels 2`
	`41`	`+ channels $SDW_JACK_CAPTURE_CH`
	`42`	`+`
`42`	`43`
`43`	`44`	`Object.Base.hw_config.1 {`
`44`	`45`	`id 0`
`@@ -354,30 +355,40 @@ Object.Pipeline.host-gateway-capture [`
`354`	`355`	`Object.Base.output_audio_format [`
`355`	`356`	`{`
`356`	`357`	`out_rate $JACK_RATE`
	`358`	`+ out_channels $SDW_JACK_CAPTURE_CH`
`357`	`359`	`out_bit_depth 16`
`358`	`360`	`out_valid_bit_depth 16`
	`361`	`+ out_fmt_cfg "$[($out_channels \| ($out_valid_bit_depth * 256))]"`
`359`	`362`	`}`
`360`	`363`	`{`
`361`	`364`	`out_rate $JACK_RATE`
	`365`	`+ out_channels $SDW_JACK_CAPTURE_CH`
`362`	`366`	`out_bit_depth 32`
`363`	`367`	`out_valid_bit_depth 24`
	`368`	`+ out_fmt_cfg "$[($out_channels \| ($out_valid_bit_depth * 256))]"`
`364`	`369`	`}`
`365`	`370`	`{`
`366`	`371`	`out_rate $JACK_RATE`
	`372`	`+ out_channels $SDW_JACK_CAPTURE_CH`
`367`	`373`	`out_bit_depth 32`
`368`	`374`	`out_valid_bit_depth 32`
	`375`	`+ out_fmt_cfg "$[($out_channels \| ($out_valid_bit_depth * 256))]"`
`369`	`376`	`}`
`370`	`377`	`{`
`371`	`378`	`out_rate $JACK_RATE`
	`379`	`+ out_channels $SDW_JACK_CAPTURE_CH`
`372`	`380`	`out_bit_depth 32`
`373`	`381`	`out_valid_bit_depth 32`
`374`	`382`	`out_sample_type $SAMPLE_TYPE_FLOAT`
	`383`	`+ out_fmt_cfg "$[($out_channels \| ($out_valid_bit_depth * 256))]"`
`375`	`384`	`}`
`376`	`385`	`{`
`377`	`386`	`out_rate $JACK_RATE`
	`387`	`+ out_channels $SDW_JACK_CAPTURE_CH`
`378`	`388`	`out_bit_depth 8`
`379`	`389`	`out_valid_bit_depth 8`
`380`	`390`	`out_sample_type $SAMPLE_TYPE_UNSIGNED_INTEGER`
	`391`	`+ out_fmt_cfg "$[($out_channels \| ($out_valid_bit_depth * 256))]"`
`381`	`392`	`}`
`382`	`393`	`]`
`383`	`394`	`}`
`@@ -386,18 +397,24 @@ Object.Pipeline.host-gateway-capture [`
`386`	`397`	`Object.Base.output_audio_format [`
`387`	`398`	`{`
`388`	`399`	`out_rate $JACK_RATE`
	`400`	`+ out_channels $SDW_JACK_CAPTURE_CH`
`389`	`401`	`out_bit_depth 16`
`390`	`402`	`out_valid_bit_depth 16`
	`403`	`+ out_fmt_cfg "$[($out_channels \| ($out_valid_bit_depth * 256))]"`
`391`	`404`	`}`
`392`	`405`	`{`
`393`	`406`	`out_rate $JACK_RATE`
	`407`	`+ out_channels $SDW_JACK_CAPTURE_CH`
`394`	`408`	`out_bit_depth 32`
`395`	`409`	`out_valid_bit_depth 24`
	`410`	`+ out_fmt_cfg "$[($out_channels \| ($out_valid_bit_depth * 256))]"`
`396`	`411`	`}`
`397`	`412`	`{`
`398`	`413`	`out_rate $JACK_RATE`
	`414`	`+ out_channels $SDW_JACK_CAPTURE_CH`
`399`	`415`	`out_bit_depth 32`
`400`	`416`	`out_valid_bit_depth 32`
	`417`	`+ out_fmt_cfg "$[($out_channels \| ($out_valid_bit_depth * 256))]"`
`401`	`418`	`}`
`402`	`419`	`]`
`403`	`420`	`}`
`@@ -444,6 +461,7 @@ Object.Widget {`
`444`	`461`	`Object.Base.input_audio_format [`
`445`	`462`	`{`
`446`	`463`	`in_rate $JACK_RATE`
	`464`	`+ in_channels $SDW_JACK_CAPTURE_CH`
`447`	`465`	`in_bit_depth 32`
`448`	`466`	`in_valid_bit_depth $SDW_LINK_VALID_BITS`
`449`	`467`	`in_sample_type $SAMPLE_TYPE_MSB_INTEGER`