topology: add KWD comp into sof-tgl-max98373-rt5682

Add KWD pipelines with vol-kfpm pipe using intel-generic-dmic-kwd tmplate.
48K DMIC still uses PCM 99
Add 16K DMIC KWD on PCM 100

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>

Author: xiulipan

tools/topology/sof-tgl-max98373-rt5682.m4

@@ -20,17 +20,38 @@ include(`platform/intel/dmic.m4')
 
 DEBUG_START
 
+
+
 #
 # Define the pipelines
 #
 # PCM0 ---> volume ----> SSP1  (Speaker - max98373)
 # PCM1 <---> volume <----> SSP0  (Headset - ALC5682)
-# PCM99 <---- volume <---- DMIC01 (dmic0 capture)
 # PCM2 ----> volume -----> iDisp1
 # PCM3 ----> volume -----> iDisp2
 # PCM4 ----> volume -----> iDisp3
 # PCM5 ----> volume -----> iDisp4
-
+# PCM99 <---- volume <---- DMIC01 (dmic 48k capture)
+# PCM100 <---- kpb <---- DMIC16K (dmic 16k capture)
+
+# Define pipeline id for intel-generic-dmic-kwd.m4
+# to generate dmic setting with kwd when we have dmic
+# define channel
+define(CHANNELS, `4')
+# define kfbm with volume
+define(KFBM_TYPE, `vol-kfbm')
+# define pcm, pipeline and dai id
+define(DMIC_PCM_48k_ID, `99')
+define(DMIC_PIPELINE_48k_ID, `4')
+define(DMIC_DAI_LINK_48k_ID, `1')
+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')
+# define pcm, pipeline and dai id
+define(KWD_PIPE_SCH_DEADLINE_US, 20000)
+# include the generic dmic with kwd
+include(`platform/intel/intel-generic-dmic-kwd.m4')
 
 dnl PIPELINE_PCM_ADD(pipeline,
 dnl     pipe id, pcm, max channels, format,
@@ -57,13 +78,6 @@ PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
 	1000, 0, 0,
 	48000, 48000, 48000)
 
-# Passthrough capture pipeline 4 on PCM 99 using max 4 channels.
-# Schedule 48 frames per 1000us deadline on core 0 with priority 0
-PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4,
-	4, 99, 4, s32le,
-	1000, 0, 0,
-	48000, 48000, 48000)
-
 # Low Latency playback pipeline 5 on PCM 2 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
@@ -122,13 +136,6 @@ DAI_ADD(sof/pipe-dai-capture.m4,
         PIPELINE_SINK_3, 2, s24le,
         1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
 
-# capture DAI is DMIC01 using 2 periods
-# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
-DAI_ADD(sof/pipe-dai-capture.m4,
-	4, DMIC, 0, dmic01,
-	PIPELINE_SINK_4, 2, s32le,
-	1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
-
 # playback DAI is iDisp1 using 2 periods
 # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
 DAI_ADD(sof/pipe-dai-playback.m4,
@@ -163,7 +170,6 @@ DAI_ADD(sof/pipe-dai-playback.m4,
 dnl PCM_PLAYBACK_ADD(name, pcm_id, playback)
 PCM_PLAYBACK_ADD(max373-spk, 0, PIPELINE_PCM_1)
 PCM_DUPLEX_ADD(Headset, 1, PIPELINE_PCM_2, PIPELINE_PCM_3)
-PCM_CAPTURE_ADD(DMIC, 99, PIPELINE_PCM_4)
 PCM_PLAYBACK_ADD(HDMI1, 2, PIPELINE_PCM_5)
 PCM_PLAYBACK_ADD(HDMI2, 3, PIPELINE_PCM_6)
 PCM_PLAYBACK_ADD(HDMI3, 4, PIPELINE_PCM_7)
@@ -195,12 +201,6 @@ DAI_CONFIG(SSP, 0, 0, SSP0-Codec,
                       SSP_TDM(2, 25, 3, 3),
                       SSP_CONFIG_DATA(SSP, 0, 24)))
 
-# dmic01 (ID: 1)
-DAI_CONFIG(DMIC, 0, 1, dmic01,
-	   DMIC_CONFIG(1, 500000, 4800000, 40, 60, 48000,
-		DMIC_WORD_LENGTH(s32le), 400, DMIC, 0,
-		PDM_CONFIG(DMIC, 0, FOUR_CH_PDM0_PDM1)))
-
 # 4 HDMI/DP outputs (ID: 3,4,5,6)
 DAI_CONFIG(HDA, 0, 3, iDisp1)
 DAI_CONFIG(HDA, 1, 4, iDisp2)