topology2: cavs-rt5682: expose spk core_id for overriding

Port from nocodec topology for multi-core validation. Signed-off-by: Yong Zhi <[email protected]>
thesofproject · Feb 7, 2024 · f219e97 · f219e97
1 parent e04289d
commit f219e97
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/tools/topology/topology2/cavs-mixin-mixout-ssp.conf b/tools/topology/topology2/cavs-mixin-mixout-ssp.conf
@@ -24,6 +24,7 @@ Object.Pipeline {
 		}
 		{
 			index	$SPEAKER_HOST_PIPELINE_ID
+			core_id	$SPEAKER_PCM_CORE_ID
 
 			Object.Widget.host-copier.1 {
 				stream_name	'$SPEAKER_PLAYBACK_PCM_STREAM_NAME'
@@ -34,6 +35,9 @@ Object.Pipeline {
 					name	'Pre Mixer $SPEAKER_PCM_NAME Playback Volume'
 				}
 			}
+			Object.Widget.pipeline.1 {
+				core	$SPEAKER_PCM_CORE_ID
+			}
 		}
 	]
 
@@ -57,6 +61,7 @@ Object.Pipeline {
             }
             {
                 index   $SPEAKER_DAI_PIPELINE_ID
+                core_id $SPEAKER_PCM_CORE_ID
 
                 Object.Widget.dai-copier.1 {
                     dai_index   $SPEAKER_SSP_DAI_INDEX
@@ -71,6 +76,10 @@ Object.Pipeline {
                         name    'Post Mixer $SPEAKER_PCM_NAME Playback Volume'
                     }
                 }
+
+                Object.Widget.pipeline.1 {
+                    core $SPEAKER_PCM_CORE_ID
+                }
             }
         ]
 }

diff --git a/tools/topology/topology2/cavs-rt5682.conf b/tools/topology/topology2/cavs-rt5682.conf
@@ -118,6 +118,7 @@ Define {
 	DMIC_PIPELINE_PRIORITY		1
 	ECHO_REF_PIPELINE_PRIORITY	0
 	PLAYBACK_PIPELINE_SRC           "volume"
+	SPEAKER_PCM_CORE_ID		0
 }
 
 # override defaults with platform-specific config

diff --git a/tools/topology/topology2/platform/intel/deep-buffer.conf b/tools/topology/topology2/platform/intel/deep-buffer.conf
@@ -57,6 +57,7 @@ IncludeByKey.DEEP_BUF_SPK {
 		Object.Pipeline.deepbuffer-playback [
 			{
 				index $DEEP_BUFFER_PIPELINE_ID_2
+				core_id $SPEAKER_PCM_CORE_ID
 
 				Object.Widget.host-copier.1 {
 					stream_name $DEEP_BUFFER_PCM_NAME_2
@@ -67,6 +68,9 @@ IncludeByKey.DEEP_BUF_SPK {
 						name 'Pre Mixer $DEEP_BUFFER_PCM_NAME_2 Volume'
 					}
 				}
+				Object.Widget.pipeline.1 {
+					core $SPEAKER_PCM_CORE_ID
+				}
 			}
 		]