Revert "topology1: sof-icl-rt711-rt1308-rt715-hdmi: remove NO_AGGREGATION"

This reverts commit 3904756.

Signed-off-by: Libin Yang <libin.yang@intel.com>

Author: libinyang

tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4

@@ -110,14 +110,16 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
 `
 # Low Latency playback pipeline 3 on PCM 2 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline with priority 0 on core 0
-PIPELINE_PCM_ADD(sof/pipe-volume-demux-playback.m4,
+PIPELINE_PCM_ADD(ifdef(`NO_AGGREGATION',`sof/pipe-volume-playback.m4',
+	`sof/pipe-volume-demux-playback.m4'),
 	3, 2, 2, s32le,
 	1000, 0, 0,
 	48000, 48000, 48000)
 
 # Low Latency playback pipeline 4 on PCM 40 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline with priority 0 on core 0
-PIPELINE_PCM_ADD(sof/pipe-dai-endpoint.m4,
+PIPELINE_PCM_ADD(ifdef(`NO_AGGREGATION', `sof/pipe-volume-playback.m4',
+	`sof/pipe-dai-endpoint.m4'),
 	4, 40, 2, s32le,
 	1000, 0, 0,
 	48000, 48000, 48000)
@@ -206,7 +208,14 @@ DAI_ADD(sof/pipe-dai-playback.m4,
 	PIPELINE_SOURCE_3, 2, s24le,
 	1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
 
-ifdef(`MONO', `',
+ifdef(`NO_AGGREGATION',
+`# playback DAI is ALH(SDW2 PIN2) using 2 periods
+# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
+DAI_ADD(sof/pipe-dai-playback.m4,
+	4, ALH, eval(AMP_2_LINK * 256 + 2), `SDW'eval(AMP_2_LINK)`-Playback',
+	PIPELINE_SOURCE_4, 2, s24le,
+	1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)',
+`ifdef(`MONO', `',
 `DAI_ADD_SCHED(sof/pipe-dai-sched-playback.m4,
 	4, ALH, eval(AMP_2_LINK * 256 + 2), `SDW'eval(AMP_1_LINK)`-Playback',
 	PIPELINE_SOURCE_4, 2, s24le,
@@ -222,7 +231,7 @@ SectionGraph."PIPE_DEMUX" {
 		dapm(PIPELINE_SOURCE_4, PIPELINE_DEMUX_3)
 	]
 }
-')
+')')
 
 # capture DAI is ALH(SDW3 PIN2) using 2 periods
 # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
@@ -262,6 +271,7 @@ PCM_CAPTURE_ADD(Jack In, 1, PIPELINE_PCM_2)
 ')
 
 PCM_PLAYBACK_ADD(Speaker, 2, PIPELINE_PCM_3)
+ifdef(`NO_AGGREGATION', `PCM_PLAYBACK_ADD(Speaker 2, 40, PIPELINE_PCM_4)',`')
 PCM_CAPTURE_ADD(Microphone, 4, PIPELINE_PCM_5)
 PCM_PLAYBACK_ADD(HDMI 1, 5, PIPELINE_PCM_6)
 PCM_PLAYBACK_ADD(HDMI 2, 6, PIPELINE_PCM_7)
@@ -287,6 +297,12 @@ DAI_CONFIG(ALH, eval(UAJ_LINK * 256 + 3), 1, `SDW'eval(UAJ_LINK)`-Capture',
 DAI_CONFIG(ALH, eval(AMP_1_LINK * 256 + 2), 2, `SDW'eval(AMP_1_LINK)`-Playback',
 	ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(AMP_1_LINK * 256 + 2), 48000, 2)))
 
+ifdef(`NO_AGGREGATION',
+`#ALH SDW2 Pin2 (ID: 3)
+DAI_CONFIG(ALH, eval(AMP_2_LINK * 256 + 2), 3, `SDW'eval(AMP_2_LINK)`-Playback',
+	ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(AMP_2_LINK * 256 + 2), 48000, 2)))',
+`')
+
 #ALH SDW3 Pin2 (ID: 4)
 DAI_CONFIG(ALH, eval(MIC_LINK * 256 + 2), 4, `SDW'eval(MIC_LINK)`-Capture',
 	ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(MIC_LINK * 256 + 2), 48000, 2)))