topology2: sdw-jack-generic: Make capture widgets honor SDW_JACK_CAPTURE_CH

rfvirgil · lgirdwood · commit ec86f80250ec · 2026-07-29T14:46:56.000+01:00
The BE DAI and all widgets in the capture path 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 widgets 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
@@ -344,8 +345,15 @@ Object.Pipeline.host-gateway-capture [
 			Object.Base.input_audio_format [
 				{
 					in_rate			$JACK_RATE
+					in_channels		$SDW_JACK_CAPTURE_CH
 					in_bit_depth 32
 					in_valid_bit_depth 32
+					IncludeByKey.SDW_JACK_CAPTURE_CH {
+						"1" {
+							in_ch_map		$CHANNEL_MAP_MONO
+							in_ch_cfg		$CHANNEL_CONFIG_MONO
+						}
+					}
 				}
 			]
 			IncludeByKey.PCM_FORMAT_ALL {
@@ -354,30 +362,65 @@ 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
+							IncludeByKey.SDW_JACK_CAPTURE_CH {
+								"1" {
+									out_ch_map		$CHANNEL_MAP_MONO
+									out_ch_cfg		$CHANNEL_CONFIG_MONO
+								}
+							}
 						}
 						{
 							out_rate		$JACK_RATE
+							out_channels		$SDW_JACK_CAPTURE_CH
 							out_bit_depth		32
 							out_valid_bit_depth	24
+							IncludeByKey.SDW_JACK_CAPTURE_CH {
+								"1" {
+									out_ch_map		$CHANNEL_MAP_MONO
+									out_ch_cfg		$CHANNEL_CONFIG_MONO
+								}
+							}
 						}
 						{
 							out_rate		$JACK_RATE
+							out_channels		$SDW_JACK_CAPTURE_CH
 							out_bit_depth		32
 							out_valid_bit_depth	32
+							IncludeByKey.SDW_JACK_CAPTURE_CH {
+								"1" {
+									out_ch_map		$CHANNEL_MAP_MONO
+									out_ch_cfg		$CHANNEL_CONFIG_MONO
+								}
+							}
 						}
 						{
 							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
+							IncludeByKey.SDW_JACK_CAPTURE_CH {
+								"1" {
+									out_ch_map		$CHANNEL_MAP_MONO
+									out_ch_cfg		$CHANNEL_CONFIG_MONO
+								}
+							}
 						}
 						{
 							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
+							IncludeByKey.SDW_JACK_CAPTURE_CH {
+								"1" {
+									out_ch_map		$CHANNEL_MAP_MONO
+									out_ch_cfg		$CHANNEL_CONFIG_MONO
+								}
+							}
 						}
 					]
 				}
@@ -386,18 +429,39 @@ 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
+							IncludeByKey.SDW_JACK_CAPTURE_CH {
+								"1" {
+									out_ch_map		$CHANNEL_MAP_MONO
+									out_ch_cfg		$CHANNEL_CONFIG_MONO
+								}
+							}
 						}
 						{
 							out_rate		$JACK_RATE
+							out_channels		$SDW_JACK_CAPTURE_CH
 							out_bit_depth		32
 							out_valid_bit_depth	24
+							IncludeByKey.SDW_JACK_CAPTURE_CH {
+								"1" {
+									out_ch_map		$CHANNEL_MAP_MONO
+									out_ch_cfg		$CHANNEL_CONFIG_MONO
+								}
+							}
 						}
 						{
 							out_rate		$JACK_RATE
+							out_channels		$SDW_JACK_CAPTURE_CH
 							out_bit_depth		32
 							out_valid_bit_depth	32
+							IncludeByKey.SDW_JACK_CAPTURE_CH {
+								"1" {
+									out_ch_map		$CHANNEL_MAP_MONO
+									out_ch_cfg		$CHANNEL_CONFIG_MONO
+								}
+							}
 						}
 					]
 				}
@@ -444,17 +508,31 @@ 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
 					in_fmt_cfg		"$[($in_channels | ($in_valid_bit_depth * 256))]"
+					IncludeByKey.SDW_JACK_CAPTURE_CH {
+						"1" {
+							in_ch_map		$CHANNEL_MAP_MONO
+							in_ch_cfg		$CHANNEL_CONFIG_MONO
+						}
+					}
 				}
 			]
 			Object.Base.output_audio_format [
 				{
 					out_rate		$JACK_RATE
+					out_channels		$SDW_JACK_CAPTURE_CH
 					out_bit_depth		32
 					out_valid_bit_depth	32
+					IncludeByKey.SDW_JACK_CAPTURE_CH {
+						"1" {
+							out_ch_map		$CHANNEL_MAP_MONO
+							out_ch_cfg		$CHANNEL_CONFIG_MONO
+						}
+					}
 				}
 			]
 		}
@@ -478,13 +556,15 @@ 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	32
 								}
 							]
 							Object.Base.output_audio_format [
 								{
 									out_rate		$JACK_RATE
+									out_channels		$SDW_JACK_CAPTURE_CH
 									out_bit_depth		32
 									out_valid_bit_depth	32
 								}
@@ -505,13 +585,15 @@ 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	32
 								}
 							]
 							Object.Base.output_audio_format [
 								{
 									out_rate		$JACK_RATE
+									out_channels		$SDW_JACK_CAPTURE_CH
 									out_bit_depth		32
 									out_valid_bit_depth	32
 								}

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`
`@@ -344,8 +345,15 @@ Object.Pipeline.host-gateway-capture [`
`344`	`345`	`Object.Base.input_audio_format [`
`345`	`346`	`{`
`346`	`347`	`in_rate $JACK_RATE`
	`348`	`+ in_channels $SDW_JACK_CAPTURE_CH`
`347`	`349`	`in_bit_depth 32`
`348`	`350`	`in_valid_bit_depth 32`
	`351`	`+ IncludeByKey.SDW_JACK_CAPTURE_CH {`
	`352`	`+ "1" {`
	`353`	`+ in_ch_map $CHANNEL_MAP_MONO`
	`354`	`+ in_ch_cfg $CHANNEL_CONFIG_MONO`
	`355`	`+ }`
	`356`	`+ }`
`349`	`357`	`}`
`350`	`358`	`]`
`351`	`359`	`IncludeByKey.PCM_FORMAT_ALL {`
`@@ -354,30 +362,65 @@ Object.Pipeline.host-gateway-capture [`
`354`	`362`	`Object.Base.output_audio_format [`
`355`	`363`	`{`
`356`	`364`	`out_rate $JACK_RATE`
	`365`	`+ out_channels $SDW_JACK_CAPTURE_CH`
`357`	`366`	`out_bit_depth 16`
`358`	`367`	`out_valid_bit_depth 16`
	`368`	`+ IncludeByKey.SDW_JACK_CAPTURE_CH {`
	`369`	`+ "1" {`
	`370`	`+ out_ch_map $CHANNEL_MAP_MONO`
	`371`	`+ out_ch_cfg $CHANNEL_CONFIG_MONO`
	`372`	`+ }`
	`373`	`+ }`
`359`	`374`	`}`
`360`	`375`	`{`
`361`	`376`	`out_rate $JACK_RATE`
	`377`	`+ out_channels $SDW_JACK_CAPTURE_CH`
`362`	`378`	`out_bit_depth 32`
`363`	`379`	`out_valid_bit_depth 24`
	`380`	`+ IncludeByKey.SDW_JACK_CAPTURE_CH {`
	`381`	`+ "1" {`
	`382`	`+ out_ch_map $CHANNEL_MAP_MONO`
	`383`	`+ out_ch_cfg $CHANNEL_CONFIG_MONO`
	`384`	`+ }`
	`385`	`+ }`
`364`	`386`	`}`
`365`	`387`	`{`
`366`	`388`	`out_rate $JACK_RATE`
	`389`	`+ out_channels $SDW_JACK_CAPTURE_CH`
`367`	`390`	`out_bit_depth 32`
`368`	`391`	`out_valid_bit_depth 32`
	`392`	`+ IncludeByKey.SDW_JACK_CAPTURE_CH {`
	`393`	`+ "1" {`
	`394`	`+ out_ch_map $CHANNEL_MAP_MONO`
	`395`	`+ out_ch_cfg $CHANNEL_CONFIG_MONO`
	`396`	`+ }`
	`397`	`+ }`
`369`	`398`	`}`
`370`	`399`	`{`
`371`	`400`	`out_rate $JACK_RATE`
	`401`	`+ out_channels $SDW_JACK_CAPTURE_CH`
`372`	`402`	`out_bit_depth 32`
`373`	`403`	`out_valid_bit_depth 32`
`374`	`404`	`out_sample_type $SAMPLE_TYPE_FLOAT`
	`405`	`+ IncludeByKey.SDW_JACK_CAPTURE_CH {`
	`406`	`+ "1" {`
	`407`	`+ out_ch_map $CHANNEL_MAP_MONO`
	`408`	`+ out_ch_cfg $CHANNEL_CONFIG_MONO`
	`409`	`+ }`
	`410`	`+ }`
`375`	`411`	`}`
`376`	`412`	`{`
`377`	`413`	`out_rate $JACK_RATE`
	`414`	`+ out_channels $SDW_JACK_CAPTURE_CH`
`378`	`415`	`out_bit_depth 8`
`379`	`416`	`out_valid_bit_depth 8`
`380`	`417`	`out_sample_type $SAMPLE_TYPE_UNSIGNED_INTEGER`
	`418`	`+ IncludeByKey.SDW_JACK_CAPTURE_CH {`
	`419`	`+ "1" {`
	`420`	`+ out_ch_map $CHANNEL_MAP_MONO`
	`421`	`+ out_ch_cfg $CHANNEL_CONFIG_MONO`
	`422`	`+ }`
	`423`	`+ }`
`381`	`424`	`}`
`382`	`425`	`]`
`383`	`426`	`}`
`@@ -386,18 +429,39 @@ Object.Pipeline.host-gateway-capture [`
`386`	`429`	`Object.Base.output_audio_format [`
`387`	`430`	`{`
`388`	`431`	`out_rate $JACK_RATE`
	`432`	`+ out_channels $SDW_JACK_CAPTURE_CH`
`389`	`433`	`out_bit_depth 16`
`390`	`434`	`out_valid_bit_depth 16`
	`435`	`+ IncludeByKey.SDW_JACK_CAPTURE_CH {`
	`436`	`+ "1" {`
	`437`	`+ out_ch_map $CHANNEL_MAP_MONO`
	`438`	`+ out_ch_cfg $CHANNEL_CONFIG_MONO`
	`439`	`+ }`
	`440`	`+ }`
`391`	`441`	`}`
`392`	`442`	`{`
`393`	`443`	`out_rate $JACK_RATE`
	`444`	`+ out_channels $SDW_JACK_CAPTURE_CH`
`394`	`445`	`out_bit_depth 32`
`395`	`446`	`out_valid_bit_depth 24`
	`447`	`+ IncludeByKey.SDW_JACK_CAPTURE_CH {`
	`448`	`+ "1" {`
	`449`	`+ out_ch_map $CHANNEL_MAP_MONO`
	`450`	`+ out_ch_cfg $CHANNEL_CONFIG_MONO`
	`451`	`+ }`
	`452`	`+ }`
`396`	`453`	`}`
`397`	`454`	`{`
`398`	`455`	`out_rate $JACK_RATE`
	`456`	`+ out_channels $SDW_JACK_CAPTURE_CH`
`399`	`457`	`out_bit_depth 32`
`400`	`458`	`out_valid_bit_depth 32`
	`459`	`+ IncludeByKey.SDW_JACK_CAPTURE_CH {`
	`460`	`+ "1" {`
	`461`	`+ out_ch_map $CHANNEL_MAP_MONO`
	`462`	`+ out_ch_cfg $CHANNEL_CONFIG_MONO`
	`463`	`+ }`
	`464`	`+ }`
`401`	`465`	`}`
`402`	`466`	`]`
`403`	`467`	`}`
`@@ -444,17 +508,31 @@ Object.Widget {`
`444`	`508`	`Object.Base.input_audio_format [`
`445`	`509`	`{`
`446`	`510`	`in_rate $JACK_RATE`
	`511`	`+ in_channels $SDW_JACK_CAPTURE_CH`
`447`	`512`	`in_bit_depth 32`
`448`	`513`	`in_valid_bit_depth $SDW_LINK_VALID_BITS`
`449`	`514`	`in_sample_type $SAMPLE_TYPE_MSB_INTEGER`
`450`	`515`	`in_fmt_cfg "$[($in_channels \| ($in_valid_bit_depth * 256))]"`
	`516`	`+ IncludeByKey.SDW_JACK_CAPTURE_CH {`
	`517`	`+ "1" {`
	`518`	`+ in_ch_map $CHANNEL_MAP_MONO`
	`519`	`+ in_ch_cfg $CHANNEL_CONFIG_MONO`
	`520`	`+ }`
	`521`	`+ }`
`451`	`522`	`}`
`452`	`523`	`]`
`453`	`524`	`Object.Base.output_audio_format [`
`454`	`525`	`{`
`455`	`526`	`out_rate $JACK_RATE`
	`527`	`+ out_channels $SDW_JACK_CAPTURE_CH`
`456`	`528`	`out_bit_depth 32`
`457`	`529`	`out_valid_bit_depth 32`
	`530`	`+ IncludeByKey.SDW_JACK_CAPTURE_CH {`
	`531`	`+ "1" {`
	`532`	`+ out_ch_map $CHANNEL_MAP_MONO`
	`533`	`+ out_ch_cfg $CHANNEL_CONFIG_MONO`
	`534`	`+ }`
	`535`	`+ }`
`458`	`536`	`}`
`459`	`537`	`]`
`460`	`538`	`}`
`@@ -478,13 +556,15 @@ Object.Widget {`
`478`	`556`	`Object.Base.input_audio_format [`
`479`	`557`	`{`
`480`	`558`	`in_rate $JACK_RATE`
	`559`	`+ in_channels $SDW_JACK_CAPTURE_CH`
`481`	`560`	`in_bit_depth 32`
`482`	`561`	`in_valid_bit_depth 32`
`483`	`562`	`}`
`484`	`563`	`]`
`485`	`564`	`Object.Base.output_audio_format [`
`486`	`565`	`{`
`487`	`566`	`out_rate $JACK_RATE`
	`567`	`+ out_channels $SDW_JACK_CAPTURE_CH`
`488`	`568`	`out_bit_depth 32`
`489`	`569`	`out_valid_bit_depth 32`
`490`	`570`	`}`
`@@ -505,13 +585,15 @@ Object.Widget {`
`505`	`585`	`Object.Base.input_audio_format [`
`506`	`586`	`{`
`507`	`587`	`in_rate $JACK_RATE`
	`588`	`+ in_channels $SDW_JACK_CAPTURE_CH`
`508`	`589`	`in_bit_depth 32`
`509`	`590`	`in_valid_bit_depth 32`
`510`	`591`	`}`
`511`	`592`	`]`
`512`	`593`	`Object.Base.output_audio_format [`
`513`	`594`	`{`
`514`	`595`	`out_rate $JACK_RATE`
	`596`	`+ out_channels $SDW_JACK_CAPTURE_CH`
`515`	`597`	`out_bit_depth 32`
`516`	`598`	`out_valid_bit_depth 32`
`517`	`599`	`}`