diff --git a/tools/topology/platform/intel/intel-generic-dmic-kwd.m4 b/tools/topology/platform/intel/intel-generic-dmic-kwd.m4 index e9a89c2d3..a2f7c587b 100644 --- a/tools/topology/platform/intel/intel-generic-dmic-kwd.m4 +++ b/tools/topology/platform/intel/intel-generic-dmic-kwd.m4 @@ -38,6 +38,9 @@ ifdef(`KWD_PIPE_SCH_DEADLINE_US',`',`fatal_error(note: Need to define schedule f # define(DMIC_DAI_LINK_48k_NAME, `dmic01') ifdef(`DMIC_DAI_LINK_48k_NAME',`',define(DMIC_DAI_LINK_48k_NAME, `dmic01')) +# define(DMIC_PIPELINE_48k_CORE_ID, 0) +ifdef(`DMIC_PIPELINE_48k_CORE_ID',`',define(DMIC_PIPELINE_48k_CORE_ID, 0)) + # define(DMIC_DAI_LINK_16k_NAME, `dmic16k') ifdef(`DMIC_DAI_LINK_16k_NAME',`',define(DMIC_DAI_LINK_16k_NAME, `dmic16k')) @@ -71,7 +74,7 @@ define(`PGA_NAME', Dmic0) PIPELINE_PCM_ADD(sof/pipe-`DMICPROC'-capture.m4, DMIC_PIPELINE_48k_ID, DMIC_PCM_48k_ID, CHANNELS, s32le, - INTEL_GENERIC_DMIC_KWD_PERIOD, 0, 1, 48000, 48000, 48000) + INTEL_GENERIC_DMIC_KWD_PERIOD, 0, DMIC_PIPELINE_48k_CORE_ID, 48000, 48000, 48000) undefine(`PGA_NAME') undefine(`PIPELINE_FILTER1') @@ -105,7 +108,7 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-capture.m4, DMIC_PIPELINE_48k_ID, DMIC, 0, DMIC_DAI_LINK_48k_NAME, concat(`PIPELINE_SINK_', DMIC_PIPELINE_48k_ID), 2, s32le, - INTEL_GENERIC_DMIC_KWD_PERIOD, 0, 1, SCHEDULE_TIME_DOMAIN_TIMER) + INTEL_GENERIC_DMIC_KWD_PERIOD, 0, DMIC_PIPELINE_48k_CORE_ID, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC 1 using 3 periods # Buffers use s32le format, with 320 frame per 20000us on core 0 with priority 0 diff --git a/tools/topology/sof-tgl-max98373-rt5682.m4 b/tools/topology/sof-tgl-max98373-rt5682.m4 index b9ae84d34..e3384b4cd 100644 --- a/tools/topology/sof-tgl-max98373-rt5682.m4 +++ b/tools/topology/sof-tgl-max98373-rt5682.m4 @@ -84,6 +84,8 @@ define(DMIC_PCM_16k_ID, `100') define(DMIC_PIPELINE_16k_ID, `9') define(DMIC_PIPELINE_KWD_ID, `10') define(DMIC_DAI_LINK_16k_ID, `2') +# Offload DMIC_PIPELINE_48K to secondary core of TGL. +define(DMIC_PIPELINE_48k_CORE_ID, 1) # define pcm, pipeline and dai id define(KWD_PIPE_SCH_DEADLINE_US, 20000) # include the generic dmic with kwd