topology2: pipeline: Remove rate attribute and rate and channels values

Remove the rest of channels and rate attribute values from pipeline instamces and remove rate attribute definition from pipeline-common.conf. There was no channels attribute definition in pipeline-common.conf, not to mention *_min and *_max attributes. Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
thesofproject · Dec 11, 2023 · 3959112 · 3959112
1 parent c036045
commit 3959112
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 28 deletions.
diff --git a/tools/topology/topology2/include/pipelines/eq-iir-volume-capture.conf b/tools/topology/topology2/include/pipelines/eq-iir-volume-capture.conf
@@ -10,8 +10,6 @@
 #		format		"s16le"
 #		period		1000
 #		time_domain	"timer"
-#		channels	2
-#		rate		48000
 #	}
 #
 # Where N is a unique integer for pipeline ID in the same alsaconf node.
@@ -117,8 +115,6 @@ Class.Pipeline."eq-iir-volume-capture" {
 	direction 	"capture"
 	time_domain	"timer"
 	period		1000
-	channels	2
-	rate		48000
 	priority	0
 	core 		0
 	frames		0

diff --git a/tools/topology/topology2/include/pipelines/passthrough-capture.conf b/tools/topology/topology2/include/pipelines/passthrough-capture.conf
@@ -10,8 +10,6 @@
 #		format		"s16le"
 #		period		1000
 #		time_domain	"timer"
-#		channels	2
-#		rate		48000
 #	}
 #
 # and N is the unique pipeline_id for this pipeline object within the same alsaconf node.
@@ -69,8 +67,6 @@ Class.Pipeline."passthrough-capture" {
 	direction 	"capture"
 	time_domain	"timer"
 	period		1000
-	channels	2
-	rate		48000
 	priority	0
 	core 		0
 	frames		0

diff --git a/tools/topology/topology2/include/pipelines/pipeline-common.conf b/tools/topology/topology2/include/pipelines/pipeline-common.conf
@@ -29,14 +29,6 @@ DefineAttribute."format" {
 	}
 }
 
-# Sampling rate
-DefineAttribute."rate" {
-	constraints {
-		min	16000
-		max	196000
-	}
-}
-
 # Pipeline direction
 DefineAttribute."direction" {
 	type	"string"

diff --git a/tools/topology/topology2/include/pipelines/volume-capture.conf b/tools/topology/topology2/include/pipelines/volume-capture.conf
@@ -10,8 +10,6 @@
 #		format		"s16le"
 #		period		1000
 #		time_domain	"timer"
-#		channels	2
-#		rate		48000
 #	}
 #
 # and N is the unique pipeline_id for this pipeline object within the same alsaconf node.
@@ -101,8 +99,6 @@ Class.Pipeline."volume-capture" {
 	direction 	"capture"
 	time_domain	"timer"
 	period		1000
-	channels	2
-	rate		48000
 	priority	0
 	core 		0
 	frames		0

diff --git a/tools/topology/topology2/include/pipelines/volume-demux-playback.conf b/tools/topology/topology2/include/pipelines/volume-demux-playback.conf
@@ -10,8 +10,6 @@
 #		format		"s16le"
 #		period		1000
 #		time_domain	"timer"
-#		channels	2
-#		rate		48000
 #	}
 #
 # Where N is a unique integer for pipeline ID in the same alsaconf node.
@@ -117,8 +115,6 @@ Class.Pipeline."volume-demux-playback" {
 	direction 	"playback"
 	time_domain	"timer"
 	period		1000
-	channels	2
-	rate		48000
 	priority	0
 	core 		0
 	frames		0

diff --git a/tools/topology/topology2/include/pipelines/volume-playback.conf b/tools/topology/topology2/include/pipelines/volume-playback.conf
@@ -12,8 +12,6 @@
 ##			format		"s16le"
 ##			period		1000
 ##			time_domain	"timer"
-##			channels	2
-##			rate		48000
 ##		}
 ##
 ## where N is the unique pipeline_id for this pipeline object within the same alsaconf node.
@@ -102,8 +100,6 @@ Class.Pipeline."volume-playback" {
 	direction 	"playback"
 	time_domain	"timer"
 	period		1000
-	channels	2
-	rate		48000
 	priority	0
 	core 		0
 	frames		0