From 5b3aa04c24b80af50d773eed470a42c05a086f8d Mon Sep 17 00:00:00 2001
From: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Date: Mon, 5 Jun 2023 11:37:27 -0700
Subject: [PATCH] topology2: cavs-nocodec: Introduce macros for PCM IDs

And fix the erroneous PCM ID for SSP0 capture.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
---
 tools/topology/topology2/cavs-nocodec.conf | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tools/topology/topology2/cavs-nocodec.conf b/tools/topology/topology2/cavs-nocodec.conf
index 4702f97d1891..773617a473a2 100644
--- a/tools/topology/topology2/cavs-nocodec.conf
+++ b/tools/topology/topology2/cavs-nocodec.conf
@@ -84,6 +84,8 @@ Define {
 	PASSTHROUGH			"false"
 	SSP0_PCM_NAME			"Port0"
 	SSP0_CAPTURE_PCM		"Port0 2nd Capture"
+	SSP0_CAPTURE_PCM_ID		12
+	SSP0_PCM_ID			0
 	SSP1_PCM_NAME			"Port1"
 	SSP2_PCM_NAME			"Port2"
 	DMIC0_PCM_0_NAME		"DMIC SFX1"
@@ -266,7 +268,7 @@ IncludeByKey.PASSTHROUGH {
 
 				Object.Widget.host-copier.1 {
 					stream_name 'SSP0 Capture'
-					pcm_id 7
+					pcm_id $SSP0_PCM_ID
 				}
 				Object.Widget.gain.1 {
 					Object.Control.mixer.1 {
@@ -280,7 +282,7 @@ IncludeByKey.PASSTHROUGH {
 				format	s32le
 				Object.Widget.host-copier.1 {
 					stream_name 'SSP0-1 Capture'
-					pcm_id 12
+					pcm_id $SSP0_CAPTURE_PCM_ID
 				}
 				Object.Widget.gain.1 {
 					Object.Control.mixer.1 {
@@ -758,7 +760,7 @@ IncludeByKey.PASSTHROUGH {
 Object.PCM.pcm [
 	{
 		name	"$SSP0_PCM_NAME"
-		id 0
+		id $SSP0_PCM_ID
 		direction	"duplex"
 		Object.Base.fe_dai.1 {
 			name	"$SSP0_PCM_NAME"
@@ -803,7 +805,7 @@ IncludeByKey.PASSTHROUGH {
 		Object.PCM.pcm [
 			{
 				name	"$SSP0_CAPTURE_PCM"
-				id 12
+				id $SSP0_CAPTURE_PCM_ID
 				direction	"capture"
 				Object.Base.fe_dai.1 {
 					name	"$SSP0_CAPTURE_PCM"
@@ -913,11 +915,11 @@ IncludeByKey.PASSTHROUGH {
 			}
 			{
 				source	"gain.7.1"
-				sink	"host-copier.7.capture"
+				sink	"host-copier.$SSP0_PCM_ID.capture"
 			}
 			{
 				source	"gain.17.1"
-				sink	"host-copier.12.capture"
+				sink	"host-copier.$SSP0_CAPTURE_PCM_ID.capture"
 			}
 		]
 	}