Audio: Fix NUM_SDW_AMP_CTC_LINKS in ctc paths

Eddy Hsu · lgirdwood · commit 21db11451cec · 2026-06-18T15:39:35.000+01:00
Fix NUM_SDW_AMP_CTC_LINKS definitions in CTC related topologies.

Signed-off-by: Eddy Hsu &lt;eddyhsu@google.com&gt;
diff --git a/tools/topology/topology2/cavs-sdw.conf b/tools/topology/topology2/cavs-sdw.conf
@@ -248,6 +248,15 @@ IncludeByKey.NUM_SDW_AMP_LINKS {
 	}
 }
 
+IncludeByKey.NUM_SDW_AMP_CTC_LINKS {
+	"[1-3]" {
+		Define {
+			# Enable compressed audio for Speaker
+			COMPRESSED_2 true
+		}
+	}
+}
+
 IncludeByKey.COMPRESSED {
 	"true" "platform/intel/compr.conf"
 }
diff --git a/tools/topology/topology2/platform/intel/sdw-amp-dax-ctc.conf b/tools/topology/topology2/platform/intel/sdw-amp-dax-ctc.conf
@@ -200,7 +200,7 @@ Object.Pipeline {
 	]
 }
 
-IncludeByKey.NUM_SDW_AMP_LINKS {
+IncludeByKey.NUM_SDW_AMP_CTC_LINKS {
 "2"	{
 		Define {
 			AMP_FEEDBACK_CH 4
diff --git a/tools/topology/topology2/platform/intel/sdw-amp-dts-ctc.conf b/tools/topology/topology2/platform/intel/sdw-amp-dts-ctc.conf
@@ -327,7 +327,7 @@ IncludeByKey.PASSTHROUGH {
 	}
 }
 
-IncludeByKey.NUM_SDW_AMP_LINKS {
+IncludeByKey.NUM_SDW_AMP_CTC_LINKS {
 "2"	{
 		Define {
 			AMP_FEEDBACK_CH 4
diff --git a/tools/topology/topology2/platform/intel/sdw-amp-generic-ctc.conf b/tools/topology/topology2/platform/intel/sdw-amp-generic-ctc.conf
@@ -258,7 +258,7 @@ IncludeByKey.PASSTHROUGH {
 	}
 }
 
-IncludeByKey.NUM_SDW_AMP_LINKS {
+IncludeByKey.NUM_SDW_AMP_CTC_LINKS {
 "2"	{
 		Define {
 			AMP_FEEDBACK_CH 4

Original file line number	Diff line number	Diff line change
`@@ -248,6 +248,15 @@ IncludeByKey.NUM_SDW_AMP_LINKS {`
`248`	`248`	`}`
`249`	`249`	`}`
`250`	`250`
	`251`	`+IncludeByKey.NUM_SDW_AMP_CTC_LINKS {`
	`252`	`+ "[1-3]" {`
	`253`	`+ Define {`
	`254`	`+ # Enable compressed audio for Speaker`
	`255`	`+ COMPRESSED_2 true`
	`256`	`+ }`
	`257`	`+ }`
	`258`	`+}`
	`259`	`+`
`251`	`260`	`IncludeByKey.COMPRESSED {`
`252`	`261`	`"true" "platform/intel/compr.conf"`
`253`	`262`	`}`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ Object.Pipeline {`
`200`	`200`	`]`
`201`	`201`	`}`
`202`	`202`
`203`		`-IncludeByKey.NUM_SDW_AMP_LINKS {`
	`203`	`+IncludeByKey.NUM_SDW_AMP_CTC_LINKS {`
`204`	`204`	`"2" {`
`205`	`205`	`Define {`
`206`	`206`	`AMP_FEEDBACK_CH 4`
Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ IncludeByKey.PASSTHROUGH {`
`327`	`327`	`}`
`328`	`328`	`}`
`329`	`329`
`330`		`-IncludeByKey.NUM_SDW_AMP_LINKS {`
	`330`	`+IncludeByKey.NUM_SDW_AMP_CTC_LINKS {`
`331`	`331`	`"2" {`
`332`	`332`	`Define {`
`333`	`333`	`AMP_FEEDBACK_CH 4`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ IncludeByKey.PASSTHROUGH {`
`258`	`258`	`}`
`259`	`259`	`}`
`260`	`260`
`261`		`-IncludeByKey.NUM_SDW_AMP_LINKS {`
	`261`	`+IncludeByKey.NUM_SDW_AMP_CTC_LINKS {`
`262`	`262`	`"2" {`
`263`	`263`	`Define {`
`264`	`264`	`AMP_FEEDBACK_CH 4`