[Sound-open-firmware] [PATCH] topology: Remove duplicate W_DAI_IN/OUT and W_PIPELINE

[Liam Girdwood]

From: Pan Xiuli <xiuli.pan at linux.intel.com>

We call PIPELINE_PCM_DAI_ADD and DAI_ADD that will duplicate call
W_DAI_IN/OUT and W_PIPELINE.

Signed-off-by: Pan Xiuli <xiuli.pan at linux.intel.com>
---
 topology/sof/pipe-passthrough-capture.m4  | 10 ----------
 topology/sof/pipe-passthrough-playback.m4 | 10 ----------
 topology/sof/pipe-src-capture.m4          | 12 ------------
 topology/sof/pipe-src-playback.m4         | 12 ------------
 topology/sof/pipe-volume-capture.m4       | 12 ------------
 topology/sof/pipe-volume-playback.m4      | 12 ------------
 6 files changed, 68 deletions(-)

diff --git a/topology/sof/pipe-passthrough-capture.m4 b/topology/sof/pipe-passthrough-capture.m4
index ff7c842..203003c 100644
--- a/topology/sof/pipe-passthrough-capture.m4
+++ b/topology/sof/pipe-passthrough-capture.m4
@@ -24,16 +24,6 @@ W_BUFFER(0, COMP_BUFFER_SIZE(2,
 	COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES),
 	PLATFORM_PASS_MEM_CAP)
 
-#
-# DAI definitions
-#
-W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, 2, 2, dai0c_plat_conf)
-
-#
-# DAI pipeline - always use 0 for DAIs
-#
-W_PIPELINE(N_DAI_IN, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, SCHEDULE_CORE, 0, pipe_dai_schedule_plat)
-
 #
 # Pipeline Graph
 #
diff --git a/topology/sof/pipe-passthrough-playback.m4 b/topology/sof/pipe-passthrough-playback.m4
index 84aa126..a2a88ad 100644
--- a/topology/sof/pipe-passthrough-playback.m4
+++ b/topology/sof/pipe-passthrough-playback.m4
@@ -24,16 +24,6 @@ W_BUFFER(0, COMP_BUFFER_SIZE(2,
 	COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES),
 	PLATFORM_PASS_MEM_CAP)
 
-#
-# DAI definitions
-#
-W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, 2, 2, dai0p_plat_conf)
-
-#
-# DAI pipeline - always use 0 for DAIs
-#
-W_PIPELINE(N_DAI_OUT, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, SCHEDULE_CORE, 0, pipe_dai_schedule_plat)
-
 #
 # Pipeline Graph
 #
diff --git a/topology/sof/pipe-src-capture.m4 b/topology/sof/pipe-src-capture.m4
index 54eeea3..6211d33 100644
--- a/topology/sof/pipe-src-capture.m4
+++ b/topology/sof/pipe-src-capture.m4
@@ -39,18 +39,6 @@ W_BUFFER(1, COMP_BUFFER_SIZE(4,
 	COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES),
 	PLATFORM_DAI_MEM_CAP)
 
-#
-# DAI definitions
-#
-W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, DAI_PERIODS,
-	DAI_PERIODS, dai0c_plat_conf)
-
-#
-# DAI pipeline
-#
-W_PIPELINE(N_DAI_IN, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES,
-	SCHEDULE_CORE, 0, pipe_dai_schedule_plat)
-
 #
 # Pipeline Graph
 #
diff --git a/topology/sof/pipe-src-playback.m4 b/topology/sof/pipe-src-playback.m4
index 51237ac..119ee2c 100644
--- a/topology/sof/pipe-src-playback.m4
+++ b/topology/sof/pipe-src-playback.m4
@@ -39,18 +39,6 @@ W_BUFFER(1, COMP_BUFFER_SIZE(4,
 	COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES),
 	PLATFORM_DAI_MEM_CAP)
 
-#
-# DAI definitions
-#
-W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, DAI_PERIODS,
-	DAI_PERIODS, dai0p_plat_conf)
-
-#
-# DAI pipeline
-#
-W_PIPELINE(N_DAI_OUT, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES,
-	SCHEDULE_CORE, 0, pipe_dai_schedule_plat)
-
 #
 # Pipeline Graph
 #
diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe-volume-capture.m4
index c3917ca..5d1c24f 100644
--- a/topology/sof/pipe-volume-capture.m4
+++ b/topology/sof/pipe-volume-capture.m4
@@ -44,18 +44,6 @@ W_BUFFER(1, COMP_BUFFER_SIZE(2,
 	COMP_SAMPLE_SIZE(DAI_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES),
 	PLATFORM_DAI_MEM_CAP)
 
-#
-# DAI definitions
-#
-W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, DAI_PERIODS,
-	DAI_PERIODS, dai0c_plat_conf)
-
-#
-# DAI pipeline - always use 0 for DAIs
-#
-W_PIPELINE(N_DAI_IN, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES,
-	SCHEDULE_CORE, 0, pipe_dai_schedule_plat)
-
 #
 # Pipeline Graph
 #
diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4
index 194aad9..727490d 100644
--- a/topology/sof/pipe-volume-playback.m4
+++ b/topology/sof/pipe-volume-playback.m4
@@ -44,18 +44,6 @@ W_BUFFER(1, COMP_BUFFER_SIZE(2,
 	COMP_SAMPLE_SIZE(DAI_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES),
 	PLATFORM_DAI_MEM_CAP)
 
-#
-# DAI definitions
-#
-W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, DAI_PERIODS,
-	DAI_PERIODS, dai0p_plat_conf)
-
-#
-# DAI pipeline - always use 0 for DAIs
-#
-W_PIPELINE(N_DAI_OUT, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES,
-	SCHEDULE_CORE, 0, pipe_dai_schedule_plat)
-
 #
 # Pipeline Graph
 #
-- 
2.14.1