topology2: speaker-echo-ref.conf: Use macros for PCM ID

Use macro to avoid hardcoding of the PCM Id. Signed-off-by: Yong Zhi <yong.zhi@intel.com>
yongzhi1 · Jul 7, 2023 · f2aafea · f2aafea
1 parent b267012
commit f2aafea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/tools/topology/topology2/cavs-rt5682.conf b/tools/topology/topology2/cavs-rt5682.conf
@@ -89,6 +89,7 @@ Define {
 	ECHO_REF_HOST_PIPELINE_ID	7
 	ECHO_REF_DAI_PIPELINE_ID	8
 	ECHO_REF_COPIER_MODULE		'module-copier.8.2'
+	ECHO_REF_PCM_ID			27
 	# override BT default definitions
 	BT_PB_HOST_PIPELINE_ID		9
 	BT_PB_DAI_PIPELINE_ID		10

diff --git a/tools/topology/topology2/platform/intel/speaker-echo-ref.conf b/tools/topology/topology2/platform/intel/speaker-echo-ref.conf
@@ -9,7 +9,7 @@ Object.Pipeline {
 
 			Object.Widget.host-copier.1 {
 				stream_name	$ECHO_REF_STREAM_NAME
-				pcm_id	27
+				pcm_id		$ECHO_REF_PCM_ID
 			}
 		}
 	]
@@ -40,7 +40,7 @@ Object.Pipeline {
 Object.PCM.pcm [
 	{
 		name	"EchoRef"
-		id	27
+		id	$ECHO_REF_PCM_ID
 		direction	"capture"
 		Object.Base.fe_dai.1 {}
 
@@ -58,6 +58,6 @@ Object.Base.route [
 	}
 	{
 		source	$ECHO_REF_COPIER_MODULE
-		sink	"host-copier.27.capture"
+		sink	"host-copier.$ECHO_REF_PCM_ID.capture"
 	}
 ]