[Sound-open-firmware] [PATCH] topology: remove DMAC ID/DMAC_CHANNEL from PIPELINE/PCM/DAI definitions

12 Jun 2018

The firmware no longer uses the DMAC ID and channel info from topology.
Signed-off-by: Ranjani Sridharan ranjani.sridharan@linux.intel.com
---
 topology/dsps/bdw.m4                      | 15 ---------
 topology/dsps/bxt.m4                      | 15 ---------
 topology/dsps/byt.m4                      | 15 ---------
 topology/dsps/cht.m4                      | 15 ---------
 topology/dsps/cnl.m4                      | 15 ---------
 topology/dsps/hsw.m4                      | 15 ---------
 topology/m4/dai.m4                        |  6 ++--
 topology/m4/pcm.m4                        | 38 +++++------------------
 topology/m4/pipeline.m4                   | 22 +++++--------
 topology/sof-apl-nocodec.m4               |  9 ++----
 topology/sof-apl-tdf8532.m4               | 30 ++++++------------
 topology/sof-bdw-rt286.m4                 |  9 ++----
 topology/sof-bdw-rt5640.m4                |  9 ++----
 topology/sof-byt-da7213.m4                |  9 ++----
 topology/sof-byt-nocodec.m4               |  9 ++----
 topology/sof-byt-rt5640.m4                |  9 ++----
 topology/sof-byt-rt5645.m4                |  9 ++----
 topology/sof-byt-rt5651.m4                |  9 ++----
 topology/sof-cht-max98090.m4              |  9 ++----
 topology/sof-cht-nocodec.m4               |  9 ++----
 topology/sof-cnl-rt274.m4                 |  6 ++--
 topology/sof-hsw-rt5640.m4                |  9 ++----
 topology/sof/pipe-dai-capture.m4          |  2 +-
 topology/sof/pipe-dai-playback.m4         |  2 +-
 topology/sof/pipe-low-latency-capture.m4  |  4 +--
 topology/sof/pipe-low-latency-playback.m4 |  4 +--
 topology/sof/pipe-passthrough-capture.m4  |  4 +--
 topology/sof/pipe-passthrough-playback.m4 |  4 +--
 topology/sof/pipe-pcm-media.m4            |  4 +--
 topology/sof/pipe-src-capture.m4          |  4 +--
 topology/sof/pipe-src-playback.m4         |  4 +--
 topology/sof/pipe-volume-capture.m4       |  4 +--
 topology/sof/pipe-volume-playback.m4      |  4 +--
 topology/sof/tokens.m4                    |  4 ---
 topology/test/test-all.m4                 |  6 ++--
 topology/test/test-capture.m4             |  3 +-
 topology/test/test-playback.m4            |  3 +-
 37 files changed, 86 insertions(+), 261 deletions(-)

diff --git a/topology/dsps/bdw.m4 b/topology/dsps/bdw.m4
index c2bf04e..1af6699 100644
--- a/topology/dsps/bdw.m4
+++ b/topology/dsps/bdw.m4
@@ -25,21 +25,6 @@ W_VENDORTUPLES(pipe_tone_schedule_plat_tokens, sof_sched_tokens, LIST(`		', `SOF
W_DATA(pipe_tone_schedule_plat, pipe_tone_schedule_plat_tokens)
-# DAI0 platform playback configuration
-W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	"1"', `SOF_TKN_DAI_DMAC_CHAN	"0"'))
-
-W_DATA(dai0p_plat_conf, dai0p_plat_tokens)
-
-# DAI0 platform capture configuration
-W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	"1"', `SOF_TKN_DAI_DMAC_CHAN	"1"'))
-
-W_DATA(dai0c_plat_conf, dai0c_plat_tokens)
-
-# PCM platform configuration
-W_VENDORTUPLES(pcm_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	PIPELINE_DMAC', `SOF_TKN_DAI_DMAC_CHAN	PIPELINE_DMAC_CHAN'))
-
-W_DATA(pcm_plat_conf, pcm_plat_tokens)
-
 # DAI schedule Configuration - scheduled by IRQ
 W_VENDORTUPLES(pipe_dai_schedule_plat_tokens, sof_sched_tokens, LIST(`		', `SOF_TKN_SCHED_MIPS	"5000"'))
diff --git a/topology/dsps/bxt.m4 b/topology/dsps/bxt.m4
index 472fa88..7626513 100644
--- a/topology/dsps/bxt.m4
+++ b/topology/dsps/bxt.m4
@@ -28,21 +28,6 @@ W_VENDORTUPLES(pipe_tone_schedule_plat_tokens, sof_sched_tokens, LIST(`		', `SOF
W_DATA(pipe_tone_schedule_plat, pipe_tone_schedule_plat_tokens)
-# DAI0 platform playback configuration
-W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	"1"', `SOF_TKN_DAI_DMAC_CHAN	"0"'))
-
-W_DATA(dai0p_plat_conf, dai0p_plat_tokens)
-
-# DAI0 platform capture configuration
-W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	"0"', `SOF_TKN_DAI_DMAC_CHAN	"1"'))
-
-W_DATA(dai0c_plat_conf, dai0c_plat_tokens)
-
-# PCM platform configuration
-W_VENDORTUPLES(pcm_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	PIPELINE_DMAC', `SOF_TKN_DAI_DMAC_CHAN	PIPELINE_DMAC_CHAN'))
-
-W_DATA(pcm_plat_conf, pcm_plat_tokens)
-
 # DAI schedule Configuration - scheduled by IRQ
 W_VENDORTUPLES(pipe_dai_schedule_plat_tokens, sof_sched_tokens, LIST(`		', `SOF_TKN_SCHED_MIPS	"5000"'))
diff --git a/topology/dsps/byt.m4 b/topology/dsps/byt.m4
index d1d4886..a25d993 100644
--- a/topology/dsps/byt.m4
+++ b/topology/dsps/byt.m4
@@ -25,21 +25,6 @@ W_VENDORTUPLES(pipe_tone_schedule_plat_tokens, sof_sched_tokens, LIST(`		', `SOF
W_DATA(pipe_tone_schedule_plat, pipe_tone_schedule_plat_tokens)
-# DAI0 platform playback configuration
-W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	"1"', `SOF_TKN_DAI_DMAC_CHAN	"0"'))
-
-W_DATA(dai0p_plat_conf, dai0p_plat_tokens)
-
-# DAI0 platform capture configuration
-W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	"1"', `SOF_TKN_DAI_DMAC_CHAN	"1"'))
-
-W_DATA(dai0c_plat_conf, dai0c_plat_tokens)
-
-# PCM platform configuration
-W_VENDORTUPLES(pcm_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	PIPELINE_DMAC', `SOF_TKN_DAI_DMAC_CHAN	PIPELINE_DMAC_CHAN'))
-
-W_DATA(pcm_plat_conf, pcm_plat_tokens)
-
 # DAI schedule Configuration - scheduled by IRQ
 W_VENDORTUPLES(pipe_dai_schedule_plat_tokens, sof_sched_tokens, LIST(`		', `SOF_TKN_SCHED_MIPS	"5000"'))
diff --git a/topology/dsps/cht.m4 b/topology/dsps/cht.m4
index 4ed114f..b6317cd 100644
--- a/topology/dsps/cht.m4
+++ b/topology/dsps/cht.m4
@@ -25,21 +25,6 @@ W_VENDORTUPLES(pipe_tone_schedule_plat_tokens, sof_sched_tokens, LIST(`		', `SOF
W_DATA(pipe_tone_schedule_plat, pipe_tone_schedule_plat_tokens)
-# DAI0 platform playback configuration
-W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	"1"', `SOF_TKN_DAI_DMAC_CHAN	"0"'))
-
-W_DATA(dai0p_plat_conf, dai0p_plat_tokens)
-
-# DAI0 platform capture configuration
-W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	"1"', `SOF_TKN_DAI_DMAC_CHAN	"1"'))
-
-W_DATA(dai0c_plat_conf, dai0c_plat_tokens)
-
-# PCM platform configuration
-W_VENDORTUPLES(pcm_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	PIPELINE_DMAC', `SOF_TKN_DAI_DMAC_CHAN	PIPELINE_DMAC_CHAN'))
-
-W_DATA(pcm_plat_conf, pcm_plat_tokens)
-
 # DAI schedule Configuration - scheduled by IRQ
 W_VENDORTUPLES(pipe_dai_schedule_plat_tokens, sof_sched_tokens, LIST(`		', `SOF_TKN_SCHED_MIPS	"5000"'))
diff --git a/topology/dsps/cnl.m4 b/topology/dsps/cnl.m4
index 41ece94..96bf6de 100644
--- a/topology/dsps/cnl.m4
+++ b/topology/dsps/cnl.m4
@@ -29,21 +29,6 @@ W_VENDORTUPLES(pipe_tone_schedule_plat_tokens, sof_sched_tokens, LIST(`		', `SOF
W_DATA(pipe_tone_schedule_plat, pipe_tone_schedule_plat_tokens)
-# DAI0 platform playback configuration
-W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	"1"', `SOF_TKN_DAI_DMAC_CHAN	"0"'))
-
-W_DATA(dai0p_plat_conf, dai0p_plat_tokens)
-
-# DAI0 platform capture configuration
-W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	"1"', `SOF_TKN_DAI_DMAC_CHAN	"1"'))
-
-W_DATA(dai0c_plat_conf, dai0c_plat_tokens)
-
-# PCM platform configuration
-W_VENDORTUPLES(pcm_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	PIPELINE_DMAC', `SOF_TKN_DAI_DMAC_CHAN	PIPELINE_DMAC_CHAN'))
-
-W_DATA(pcm_plat_conf, pcm_plat_tokens)
-
 # DAI schedule Configuration - scheduled by IRQ
 W_VENDORTUPLES(pipe_dai_schedule_plat_tokens, sof_sched_tokens, LIST(`		', `SOF_TKN_SCHED_MIPS	"5000"'))
diff --git a/topology/dsps/hsw.m4 b/topology/dsps/hsw.m4
index 754fc41..c096732 100644
--- a/topology/dsps/hsw.m4
+++ b/topology/dsps/hsw.m4
@@ -25,21 +25,6 @@ W_VENDORTUPLES(pipe_tone_schedule_plat_tokens, sof_sched_tokens, LIST(`		', `SOF
W_DATA(pipe_tone_schedule_plat, pipe_tone_schedule_plat_tokens)
-# DAI0 platform playback configuration
-W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	"1"', `SOF_TKN_DAI_DMAC_CHAN	"0"'))
-
-W_DATA(dai0p_plat_conf, dai0p_plat_tokens)
-
-# DAI0 platform capture configuration
-W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	"1"', `SOF_TKN_DAI_DMAC_CHAN	"1"'))
-
-W_DATA(dai0c_plat_conf, dai0c_plat_tokens)
-
-# PCM platform configuration
-W_VENDORTUPLES(pcm_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	PIPELINE_DMAC', `SOF_TKN_DAI_DMAC_CHAN	PIPELINE_DMAC_CHAN'))
-
-W_DATA(pcm_plat_conf, pcm_plat_tokens)
-
 # DAI schedule Configuration - scheduled by IRQ
 W_VENDORTUPLES(pipe_dai_schedule_plat_tokens, sof_sched_tokens, LIST(`		', `SOF_TKN_SCHED_MIPS	"5000"'))
diff --git a/topology/m4/dai.m4 b/topology/m4/dai.m4
index a349a3c..bd67413 100644
--- a/topology/m4/dai.m4
+++ b/topology/m4/dai.m4
@@ -7,7 +7,7 @@ define(`N_DAI', DAI_NAME)
 define(`N_DAI_OUT', DAI_NAME`.OUT')
 define(`N_DAI_IN', DAI_NAME`.IN')
-dnl W_DAI_OUT(type, index, dai_link, format, periods_sink, periods_source, preload, data)
+dnl W_DAI_OUT(type, index, dai_link, format, periods_sink, periods_source, preload)
 define(`W_DAI_OUT',
 `SectionVendorTuples."'N_DAI_OUT($2)`_tuples_w_comp" {'
 `	tokens "sof_comp_tokens"'
@@ -57,11 +57,10 @@ define(`W_DAI_OUT',
 `		"'N_DAI_OUT($2)`_data_w_comp"'
 `		"'N_DAI_OUT($2)`_data_str"'
 `		"'N_DAI_OUT($2)`_data_comp_str"'
-`		"'$8`"'
 `	]'
 `}')
-dnl W_DAI_IN(type, index, dai_link, format, periods_sink, periods_source, preload, data)
+dnl W_DAI_IN(type, index, dai_link, format, periods_sink, periods_source, preload)
 define(`W_DAI_IN',
 `SectionVendorTuples."'N_DAI_IN($2)`_tuples_w_comp" {'
 `	tokens "sof_comp_tokens"'
@@ -111,7 +110,6 @@ define(`W_DAI_IN',
 `		"'N_DAI_IN($2)`_data_w_comp"'
 `		"'N_DAI_IN($2)`_data_str"'
 `		"'N_DAI_IN($2)`_data_comp_str"'
-`		"'$8`"'
 `	]'
 `}')
diff --git a/topology/m4/pcm.m4 b/topology/m4/pcm.m4
index 40a3b17..51775fb 100644
--- a/topology/m4/pcm.m4
+++ b/topology/m4/pcm.m4
@@ -6,72 +6,50 @@ dnl PCM name)
 define(`N_PCMP', `PCM'$1`P')
 define(`N_PCMC', `PCM'$1`C')
-dnl W_PCM_PLAYBACK(pcm, stream, dmac, dmac_chan, periods_sink, periods_source, preload)
+dnl W_PCM_PLAYBACK(pcm, stream, periods_sink, periods_source, preload)
 dnl  PCM platform configuration
 define(`W_PCM_PLAYBACK',
 `SectionVendorTuples."'N_PCMP($1)`_tuples_w_comp" {'
 `	tokens "sof_comp_tokens"'
 `	tuples."word" {'
-`		SOF_TKN_COMP_PERIOD_SINK_COUNT'		STR($5)
-`		SOF_TKN_COMP_PERIOD_SOURCE_COUNT'	STR($6)
-`		SOF_TKN_COMP_PRELOAD_COUNT'		STR($7)
+`		SOF_TKN_COMP_PERIOD_SINK_COUNT'		STR($3)
+`		SOF_TKN_COMP_PERIOD_SOURCE_COUNT'	STR($4)
+`		SOF_TKN_COMP_PRELOAD_COUNT'		STR($5)
 `	}'
 `}'
 `SectionData."'N_PCMP($1)`_data_w_comp" {'
 `	tuples "'N_PCMP($1)`_tuples_w_comp"'
 `}'
-`SectionVendorTuples."'N_PCMP($1)`_tuples" {'
-`	tokens "sof_pcm_tokens"'
-`	tuples."word" {'
-`		SOF_TKN_PCM_DMAC'	STR($3)
-`		SOF_TKN_PCM_DMAC_CHAN'	STR($4)
-`	}'
-`}'
-`SectionData."'N_PCMP($1)`_data" {'
-`	tuples "'N_PCMP($1)`_tuples"'
-`}'
 `SectionWidget."'N_PCMP($1)`" {'
 `	index "'PIPELINE_ID`"'
 `	type "aif_in"'
 `	no_pm "true"'
 `	stream_name "'$2` '$1`"'
 `	data ['
-`		"'N_PCMP($1)`_data"'
 `		"'N_PCMP($1)`_data_w_comp"'
 `	]'
 `}')
-dnl W_PCM_CAPTURE(pcm, stream, dmac, dmac_chan, periods_sink, periods_source, preload)
+dnl W_PCM_CAPTURE(pcm, stream, periods_sink, periods_source, preload)
 define(`W_PCM_CAPTURE',
 `SectionVendorTuples."'N_PCMC($1)`_tuples_w_comp" {'
 `	tokens "sof_comp_tokens"'
 `	tuples."word" {'
-`		SOF_TKN_COMP_PERIOD_SINK_COUNT'		STR($5)
-`		SOF_TKN_COMP_PERIOD_SOURCE_COUNT'	STR($6)
-`		SOF_TKN_COMP_PRELOAD_COUNT'		STR($7)
+`		SOF_TKN_COMP_PERIOD_SINK_COUNT'		STR($3)
+`		SOF_TKN_COMP_PERIOD_SOURCE_COUNT'	STR($4)
+`		SOF_TKN_COMP_PRELOAD_COUNT'		STR($5)
 `	}'
 `}'
 `SectionData."'N_PCMC($1)`_data_w_comp" {'
 `	tuples "'N_PCMC($1)`_tuples_w_comp"'
 `}'
-`SectionVendorTuples."'N_PCMC($1)`_tuples" {'
-`	tokens "sof_pcm_tokens"'
-`	tuples."word" {'
-`		SOF_TKN_PCM_DMAC'	STR($3)
-`		SOF_TKN_PCM_DMAC_CHAN'	STR($4)
-`	}'
-`}'
-`SectionData."'N_PCMC($1)`_data" {'
-`	tuples "'N_PCMC($1)`_tuples"'
-`}'
 `SectionWidget."'N_PCMC($1)`" {'
 `	index "'PIPELINE_ID`"'
 `	type "aif_out"'
 `	no_pm "true"'
 `	stream_name "'$2` '$1`"'
 `	data ['
-`		"'N_PCMC($1)`_data"'
 `		"'N_PCMC($1)`_data_w_comp"'
 `	]'
 `}')
diff --git a/topology/m4/pipeline.m4 b/topology/m4/pipeline.m4
index 7a91439..0cfe486 100644
--- a/topology/m4/pipeline.m4
+++ b/topology/m4/pipeline.m4
@@ -33,7 +33,7 @@ define(`W_PIPELINE',
dnl PIPELINE_PCM_ADD(pipeline,
 dnl     pipe id, pcm, max channels, format,
-dnl     frames, deadline, priority, core, dmac, dmac_chan)
+dnl     frames, deadline, priority, core)
 define(`PIPELINE_PCM_ADD',
 `undefine(`PCM_ID')'
 `undefine(`PIPELINE_ID')'
@@ -43,8 +43,6 @@ define(`PIPELINE_PCM_ADD',
 `undefine(`SCHEDULE_DEADLINE')'
 `undefine(`SCHEDULE_PRIORITY')'
 `undefine(`SCHEDULE_CORE')'
-`undefine(`PIPELINE_DMAC')'
-`undefine(`PIPELINE_DMAC_CHAN')'
 `define(`PIPELINE_ID', $2)'
 `define(`PCM_ID', $3)'
 `define(`PIPELINE_CHANNELS', $4)'
@@ -53,14 +51,12 @@ define(`PIPELINE_PCM_ADD',
 `define(`SCHEDULE_DEADLINE', $7)'
 `define(`SCHEDULE_PRIORITY', $8)'
 `define(`SCHEDULE_CORE', $9)'
-`define(`PIPELINE_DMAC', $10)'
-`define(`PIPELINE_DMAC_CHAN', $11)'
 `include($1)'
 )
dnl PIPELINE_PCM_DAI_ADD(pipeline,
 dnl     pipe id, pcm, max channels, format,
-dnl     frames, deadline, priority, core, dmac, dmac_chan,
+dnl     frames, deadline, priority, core,
 dnl     dai type, dai_index, dai format, periods)
 define(`PIPELINE_PCM_DAI_ADD',
 `undefine(`PCM_ID')'
@@ -71,8 +67,6 @@ define(`PIPELINE_PCM_DAI_ADD',
 `undefine(`SCHEDULE_DEADLINE')'
 `undefine(`SCHEDULE_PRIORITY')'
 `undefine(`SCHEDULE_CORE')'
-`undefine(`PIPELINE_DMAC')'
-`undefine(`PIPELINE_DMAC_CHAN')'
 `undefine(`DAI_TYPE')'
 `undefine(`DAI_INDEX')'
 `undefine(`DAI_FORMAT')'
@@ -85,13 +79,11 @@ define(`PIPELINE_PCM_DAI_ADD',
 `define(`SCHEDULE_DEADLINE', $7)'
 `define(`SCHEDULE_PRIORITY', $8)'
 `define(`SCHEDULE_CORE', $9)'
-`define(`PIPELINE_DMAC', $10)'
-`define(`PIPELINE_DMAC_CHAN', $11)'
-`define(`DAI_TYPE', STR($12))'
-`define(`DAI_INDEX', STR($13))'
-`define(`DAI_FORMAT', $14)'
-`define(`DAI_PERIODS', $15)'
-`define(`DAI_NAME', $12$13)'
+`define(`DAI_TYPE', STR($10))'
+`define(`DAI_INDEX', STR($11))'
+`define(`DAI_FORMAT', $12)'
+`define(`DAI_PERIODS', $13)'
+`define(`DAI_NAME', $10$11)'
 `include($1)'
 )
diff --git a/topology/sof-apl-nocodec.m4 b/topology/sof-apl-nocodec.m4
index ac3ee75..32a3b86 100644
--- a/topology/sof-apl-nocodec.m4
+++ b/topology/sof-apl-nocodec.m4
@@ -30,24 +30,21 @@ include(`dsps/bxt.m4')
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
 PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4,
    1, 0, 2, s32le,
-	48, 1000, 0, 0, 0, 1)
+	48, 1000, 0, 0)
# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 2 for PCM audio capture data
 PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
    2, 0, 2, s32le,
-	48, 1000, 0, 0, 0, 2)
+	48, 1000, 0, 0)
# PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le.
 # Schedule 96 frames per 2000us deadline on core 0 with priority 1
-# Use DMAC 0 channel 3 for PCM audio playback data
 PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
    3, 1, 2, s32le,
-	96, 2000, 1, 0, 0, 3)
+	96, 2000, 1, 0)
# Tone Playback pipeline 5 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 2
diff --git a/topology/sof-apl-tdf8532.m4 b/topology/sof-apl-tdf8532.m4
index 776f8d5..a0b44e2 100644
--- a/topology/sof-apl-tdf8532.m4
+++ b/topology/sof-apl-tdf8532.m4
@@ -33,73 +33,63 @@ include(`dsps/bxt.m4')
# Low Latency playback pipeline 1 on PCM 0 using max 4 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
 PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4,
    1, 0, 4, s32le,
-	48, 1000, 0, 0, 0, 1, SSP, 4, s32le, 2)
+	48, 1000, 0, 0, SSP, 4, s32le, 2)
# Low Latency playback pipeline 2 on PCM 1 using max 8 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
 PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4,
    2, 1, 8, s32le,
-	48, 1000, 0, 0, 0, 1, SSP, 2, s32le, 2)
+	48, 1000, 0, 0, SSP, 2, s32le, 2)
# Low Latency capture pipeline 3 on PCM 1 using max 8 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
 PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
    3, 1, 8, s32le,
-	48, 1000, 0, 0, 0, 1, SSP, 2, s32le, 2)
+	48, 1000, 0, 0, SSP, 2, s32le, 2)
# Low Latency playback pipeline 4 on PCM 2 using max 2 channels of s16le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
 PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4,
    4, 2, 2, s16le,
-	48, 1000, 0, 0, 0, 1, SSP, 0, s16le, 2)
+	48, 1000, 0, 0, SSP, 0, s16le, 2)
# Low Latency capture pipeline 5 on PCM 2 using max 2 channels of s16le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
 PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
    5, 2, 2, s16le,
-	48, 1000, 0, 0, 0, 1, SSP, 0, s16le, 2)
+	48, 1000, 0, 0, SSP, 0, s16le, 2)
# Low Latency capture pipeline 6 on PCM 3 using max 2 channels of s16le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
 PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
    6, 3, 2, s16le,
-	48, 1000, 0, 0, 0, 1, SSP, 1, s16le, 2)
+	48, 1000, 0, 0, SSP, 1, s16le, 2)
# Low Latency playback pipeline 7 on PCM 4 using max 2 channels of s16le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
 PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4,
    7, 4, 2, s16le,
-	48, 1000, 0, 0, 0, 1, SSP, 3, s16le, 2)
+	48, 1000, 0, 0, SSP, 3, s16le, 2)
# Low Latency capture pipeline 8 on PCM 4 using max 2 channels of s16le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
 PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
    8, 4, 2, s16le,
-	48, 1000, 0, 0, 0, 1, SSP, 3, s16le, 2)
+	48, 1000, 0, 0, SSP, 3, s16le, 2)
# Low Latency playback pipeline 9 on PCM 5 using max 2 channels of s16le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
 PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4,
    9, 5, 2, s16le,
-	48, 1000, 0, 0, 0, 1, SSP, 5, s16le, 2)
+	48, 1000, 0, 0, SSP, 5, s16le, 2)
# Low Latency capture pipeline 10 on PCM 5 using max 2 channels of s16le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
 PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
    10, 5, 2, s16le,
-	48, 1000, 0, 0, 0, 1, SSP, 5, s16le, 2)
+	48, 1000, 0, 0, SSP, 5, s16le, 2)
#
diff --git a/topology/sof-bdw-rt286.m4 b/topology/sof-bdw-rt286.m4
index 6d09e2e..d1ef535 100644
--- a/topology/sof-bdw-rt286.m4
+++ b/topology/sof-bdw-rt286.m4
@@ -30,24 +30,21 @@ include(`dsps/bdw.m4')
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
 PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4,
    1, 0, 2, s32le,
-	48, 1000, 0, 0, 1, 1)
+	48, 1000, 0, 0)
# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 2 for PCM audio capture data
 PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
    2, 0, 2, s32le,
-	48, 1000, 0, 0, 1, 2)
+	48, 1000, 0, 0)
# PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le.
 # Schedule 96 frames per 2000us deadline on core 0 with priority 1
-# Use DMAC 0 channel 3 for PCM audio playback data
 PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
    3, 1, 2, s32le,
-	96, 2000, 1, 0, 1, 3)
+	96, 2000, 1, 0)
# Tone Playback pipeline 5 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 2
diff --git a/topology/sof-bdw-rt5640.m4 b/topology/sof-bdw-rt5640.m4
index 2f9badb..258ecc4 100644
--- a/topology/sof-bdw-rt5640.m4
+++ b/topology/sof-bdw-rt5640.m4
@@ -30,24 +30,21 @@ include(`dsps/bdw.m4')
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
 PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4,
    1, 0, 2, s32le,
-	48, 1000, 0, 0, 1, 1)
+	48, 1000, 0, 0)
# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 2 for PCM audio capture data
 PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
    2, 0, 2, s32le,
-	48, 1000, 0, 0, 1, 2)
+	48, 1000, 0, 0)
# PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le.
 # Schedule 96 frames per 2000us deadline on core 0 with priority 1
-# Use DMAC 0 channel 3 for PCM audio playback data
 PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
    3, 1, 2, s32le,
-	96, 2000, 1, 0, 1, 3)
+	96, 2000, 1, 0)
# Tone Playback pipeline 5 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 2
diff --git a/topology/sof-byt-da7213.m4 b/topology/sof-byt-da7213.m4
index 090b034..a89e51b 100644
--- a/topology/sof-byt-da7213.m4
+++ b/topology/sof-byt-da7213.m4
@@ -30,24 +30,21 @@ include(`dsps/byt.m4')
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
 PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4,
    1, 0, 2, s32le,
-	48, 1000, 0, 0, 0, 1)
+	48, 1000, 0, 0)
# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 2 for PCM audio capture data
 PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
    2, 0, 2, s32le,
-	48, 1000, 0, 0, 0, 2)
+	48, 1000, 0, 0)
# PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 1
-# Use DMAC 0 channel 3 for PCM audio playback data
 PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
    3, 1, 2, s32le,
-	192, 4000, 1, 0, 0, 3)
+	192, 4000, 1, 0)
# Tone Playback pipeline 5 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 2
diff --git a/topology/sof-byt-nocodec.m4 b/topology/sof-byt-nocodec.m4
index 9bed36e..b305d27 100644
--- a/topology/sof-byt-nocodec.m4
+++ b/topology/sof-byt-nocodec.m4
@@ -30,24 +30,21 @@ include(`dsps/byt.m4')
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
 PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4,
    1, 0, 2, s32le,
-	48, 1000, 0, 0, 0, 1)
+	48, 1000, 0, 0)
# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 2 for PCM audio capture data
 PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
    2, 0, 2, s32le,
-	48, 1000, 0, 0, 0, 2)
+	48, 1000, 0, 0)
# PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 1
-# Use DMAC 0 channel 3 for PCM audio playback data
 PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
    3, 1, 2, s32le,
-	192, 4000, 1, 0, 0, 3)
+	192, 4000, 1, 0)
# Tone Playback pipeline 5 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 2
diff --git a/topology/sof-byt-rt5640.m4 b/topology/sof-byt-rt5640.m4
index f852616..aafa10f 100644
--- a/topology/sof-byt-rt5640.m4
+++ b/topology/sof-byt-rt5640.m4
@@ -30,24 +30,21 @@ include(`dsps/byt.m4')
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
 PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4,
    1, 0, 2, s32le,
-	48, 1000, 0, 0, 0, 1)
+	48, 1000, 0, 0)
# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 2 for PCM audio capture data
 PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
    2, 0, 2, s32le,
-	48, 1000, 0, 0, 0, 2)
+	48, 1000, 0, 0)
# PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 1
-# Use DMAC 0 channel 3 for PCM audio playback data
 PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
    3, 1, 2, s32le,
-	192, 4000, 1, 0, 0, 3)
+	192, 4000, 1, 0)
# Tone Playback pipeline 5 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 2
diff --git a/topology/sof-byt-rt5645.m4 b/topology/sof-byt-rt5645.m4
index 7d8eee5..415bc0a 100644
--- a/topology/sof-byt-rt5645.m4
+++ b/topology/sof-byt-rt5645.m4
@@ -30,24 +30,21 @@ include(`dsps/byt.m4')
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
 PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4,
    1, 0, 2, s32le,
-	48, 1000, 0, 0, 0, 1)
+	48, 1000, 0, 0)
# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 2 for PCM audio capture data
 PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
    2, 0, 2, s32le,
-	48, 1000, 0, 0, 0, 2)
+	48, 1000, 0, 0)
# PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 1
-# Use DMAC 0 channel 3 for PCM audio playback data
 PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
    3, 1, 2, s32le,
-	192, 4000, 1, 0, 0, 3)
+	192, 4000, 1, 0)
# Tone Playback pipeline 5 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 2
diff --git a/topology/sof-byt-rt5651.m4 b/topology/sof-byt-rt5651.m4
index 894602a..14e45c0 100644
--- a/topology/sof-byt-rt5651.m4
+++ b/topology/sof-byt-rt5651.m4
@@ -30,24 +30,21 @@ include(`dsps/byt.m4')
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
 PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4,
    1, 0, 2, s32le,
-	48, 1000, 0, 0, 0, 1)
+	48, 1000, 0, 0)
# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 2 for PCM audio capture data
 PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
    2, 0, 2, s32le,
-	48, 1000, 0, 0, 0, 2)
+	48, 1000, 0, 0)
# PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 1
-# Use DMAC 0 channel 3 for PCM audio playback data
 PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
    3, 1, 2, s32le,
-	192, 4000, 1, 0, 0, 3)
+	192, 4000, 1, 0)
# Tone Playback pipeline 5 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 2
diff --git a/topology/sof-cht-max98090.m4 b/topology/sof-cht-max98090.m4
index 2d5192a..e02056c 100644
--- a/topology/sof-cht-max98090.m4
+++ b/topology/sof-cht-max98090.m4
@@ -30,24 +30,21 @@ include(`dsps/cht.m4')
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
 PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4,
    1, 0, 2, s32le,
-	48, 1000, 0, 0, 0, 1)
+	48, 1000, 0, 0)
# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 2 for PCM audio capture data
 PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
    2, 0, 2, s32le,
-	48, 1000, 0, 0, 0, 2)
+	48, 1000, 0, 0)
# PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 1
-# Use DMAC 0 channel 3 for PCM audio playback data
 PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
    3, 1, 2, s32le,
-	192, 4000, 1, 0, 0, 3)
+	192, 4000, 1, 0)
# Tone Playback pipeline 5 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 2
diff --git a/topology/sof-cht-nocodec.m4 b/topology/sof-cht-nocodec.m4
index 68abf37..f56a7a5 100644
--- a/topology/sof-cht-nocodec.m4
+++ b/topology/sof-cht-nocodec.m4
@@ -30,24 +30,21 @@ include(`dsps/cht.m4')
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
 PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4,
    1, 0, 2, s32le,
-	48, 1000, 0, 0, 0, 1)
+	48, 1000, 0, 0)
# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 2 for PCM audio capture data
 PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
    2, 0, 2, s32le,
-	48, 1000, 0, 0, 0, 2)
+	48, 1000, 0, 0)
# PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 1
-# Use DMAC 0 channel 3 for PCM audio playback data
 PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
    3, 1, 2, s32le,
-	192, 4000, 1, 0, 0, 3)
+	192, 4000, 1, 0)
# Tone Playback pipeline 5 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 2
diff --git a/topology/sof-cnl-rt274.m4 b/topology/sof-cnl-rt274.m4
index 25a4913..a805f9e 100644
--- a/topology/sof-cnl-rt274.m4
+++ b/topology/sof-cnl-rt274.m4
@@ -26,17 +26,15 @@ include(`dsps/cnl.m4')
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s24le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
 PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4,
    1, 0, 2, s24le,
-	48, 1000, 0, 0, 0, 1, SSP, 0, s24le, 2)
+	48, 1000, 0, 0, SSP, 0, s24le, 2)
# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s24le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 2 for PCM audio capture data
 PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
    2, 0, 2, s24le,
-	48, 1000, 0, 0, 0, 1, SSP, 0, s24le, 2)
+	48, 1000, 0, 0, SSP, 0, s24le, 2)
#
 # DAI configuration
diff --git a/topology/sof-hsw-rt5640.m4 b/topology/sof-hsw-rt5640.m4
index 22d79d5..c99f39b 100644
--- a/topology/sof-hsw-rt5640.m4
+++ b/topology/sof-hsw-rt5640.m4
@@ -30,24 +30,21 @@ include(`dsps/hsw.m4')
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
 PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4,
    1, 0, 2, s32le,
-	48, 1000, 0, 0, 1, 1)
+	48, 1000, 0, 0)
# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 2 for PCM audio capture data
 PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
    2, 0, 2, s32le,
-	48, 1000, 0, 0, 1, 2)
+	48, 1000, 0, 0)
# PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 1
-# Use DMAC 0 channel 3 for PCM audio playback data
 PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
    3, 1, 2, s32le,
-	192, 4000, 1, 0, 1, 3)
+	192, 4000, 1, 0)
# Tone Playback pipeline 5 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 2
diff --git a/topology/sof/pipe-dai-capture.m4 b/topology/sof/pipe-dai-capture.m4
index 3f16f87..c69d586 100644
--- a/topology/sof/pipe-dai-capture.m4
+++ b/topology/sof/pipe-dai-capture.m4
@@ -8,7 +8,7 @@ include(`pipeline.m4')
 #
 # DAI definitions
 #
-W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 2, 0, 0, dai0c_plat_conf)
+W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 2, 0, 0)
#
 # DAI pipeline - always use 0 for DAIs
diff --git a/topology/sof/pipe-dai-playback.m4 b/topology/sof/pipe-dai-playback.m4
index 2397875..804b180 100644
--- a/topology/sof/pipe-dai-playback.m4
+++ b/topology/sof/pipe-dai-playback.m4
@@ -8,7 +8,7 @@ include(`pipeline.m4')
 #
 # DAI definitions
 #
-W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, 2, 2, dai0p_plat_conf)
+W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, 2, 2)
#
 # DAI pipeline - always use 0 for DAIs
diff --git a/topology/sof/pipe-low-latency-capture.m4 b/topology/sof/pipe-low-latency-capture.m4
index 39be2bc..39c2cce 100644
--- a/topology/sof/pipe-low-latency-capture.m4
+++ b/topology/sof/pipe-low-latency-capture.m4
@@ -27,9 +27,9 @@ C_CONTROLMIXER(PCM PCM_ID Capture Volume, PIPELINE_ID,
 # Components and Buffers
 #
-# Host "Low Latency Capture" PCM uses pipeline DMAC and channel
+# Host "Low Latency Capture" PCM
 # with 0 sink and 2 source periods
-W_PCM_CAPTURE(PCM_ID, Low Latency Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 0)
+W_PCM_CAPTURE(PCM_ID, Low Latency Capture, 0, 2, 0)
# "Capture Volume" has 2 sink and source periods for host and DAI ping-pong
 W_PGA(0, PIPELINE_FORMAT, 2, 2, 0, LIST(`		', "PCM PCM_ID Capture Volume PIPELINE_ID"))
diff --git a/topology/sof/pipe-low-latency-playback.m4 b/topology/sof/pipe-low-latency-playback.m4
index b40b793..8cfe5e4 100644
--- a/topology/sof/pipe-low-latency-playback.m4
+++ b/topology/sof/pipe-low-latency-playback.m4
@@ -52,9 +52,9 @@ C_CONTROLMIXER(Master Playback Volume, PIPELINE_ID,
 # Components and Buffers
 #
-# Host "Low latency Playback" PCM uses pipeline DMAC and channel
+# Host "Low latency Playback" PCM
 # with 2 sink and 0 source periods
-W_PCM_PLAYBACK(PCM_ID, Low Latency Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2)
+W_PCM_PLAYBACK(PCM_ID, Low Latency Playback, 2, 0, 2)
# "Playback Volume" has 1 sink period and 2 source periods for host ping-pong
 W_PGA(0, PIPELINE_FORMAT, 1, 2, 1, LIST(`		', "PCM PCM_ID Playback Volume PIPELINE_ID"))
diff --git a/topology/sof/pipe-passthrough-capture.m4 b/topology/sof/pipe-passthrough-capture.m4
index c6850f9..1dc695c 100644
--- a/topology/sof/pipe-passthrough-capture.m4
+++ b/topology/sof/pipe-passthrough-capture.m4
@@ -15,9 +15,9 @@ include(`pipeline.m4')
 # Components and Buffers
 #
-# Host "Passthrough Capture" PCM uses pipeline DMAC and channel
+# Host "Passthrough Capture" PCM
 # with 0 sink and 2 source periods
-W_PCM_CAPTURE(PCM_ID, Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 2)
+W_PCM_CAPTURE(PCM_ID, Passthrough Capture, 0, 2, 2)
# Capture Buffers
 W_BUFFER(0, COMP_BUFFER_SIZE(2,
diff --git a/topology/sof/pipe-passthrough-playback.m4 b/topology/sof/pipe-passthrough-playback.m4
index e2cd645..c7c1237 100644
--- a/topology/sof/pipe-passthrough-playback.m4
+++ b/topology/sof/pipe-passthrough-playback.m4
@@ -15,9 +15,9 @@ include(`pipeline.m4')
 # Components and Buffers
 #
-# Host "Passthrough Playback" PCM uses pipeline DMAC and channel
+# Host "Passthrough Playback" PCM
 # with 2 sink and 0 source periods
-W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2)
+W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, 2, 0, 2)
# Playback Buffers
 W_BUFFER(0, COMP_BUFFER_SIZE(2,
diff --git a/topology/sof/pipe-pcm-media.m4 b/topology/sof/pipe-pcm-media.m4
index 7f68977..b526e43 100644
--- a/topology/sof/pipe-pcm-media.m4
+++ b/topology/sof/pipe-pcm-media.m4
@@ -40,9 +40,9 @@ W_DATA(media_src_conf, media_src_tokens)
 # Components and Buffers
 #
-# Host "Low latency Playback" PCM uses pipeline DMAC and channel
+# Host "Low latency Playback" PCM
 # with 2 sink and 0 source periods
-W_PCM_PLAYBACK(PCM_ID, Media Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2)
+W_PCM_PLAYBACK(PCM_ID, Media Playback, 2, 0, 2)
# "Playback Volume" has 2 sink period and 2 source periods for host ping-pong
 W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(`		', "PCM PCM_ID Playback Volume PIPELINE_ID"))
diff --git a/topology/sof/pipe-src-capture.m4 b/topology/sof/pipe-src-capture.m4
index 6211d33..e0a68e4 100644
--- a/topology/sof/pipe-src-capture.m4
+++ b/topology/sof/pipe-src-capture.m4
@@ -16,9 +16,9 @@ include(`pipeline.m4')
 # Components and Buffers
 #
-# Host "Passthrough Capture" PCM uses pipeline DMAC and channel
+# Host "Passthrough Capture" PCM
 # with 4 sink and 0 source periods
-W_PCM_CAPTURE(PCM_ID, Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 4, 0, 2)
+W_PCM_CAPTURE(PCM_ID, Passthrough Capture, 4, 0, 2)
#
 # SRC Configuration
diff --git a/topology/sof/pipe-src-playback.m4 b/topology/sof/pipe-src-playback.m4
index 119ee2c..1699198 100644
--- a/topology/sof/pipe-src-playback.m4
+++ b/topology/sof/pipe-src-playback.m4
@@ -16,9 +16,9 @@ include(`pipeline.m4')
 # Components and Buffers
 #
-# Host "Passthrough Playback" PCM uses pipeline DMAC and channel
+# Host "Passthrough Playback" PCM
 # with 4 sink and 0 source periods
-W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 4, 0, 2)
+W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, 4, 0, 2)
#
 # SRC Configuration
diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe-volume-capture.m4
index 6b768e3..820b745 100644
--- a/topology/sof/pipe-volume-capture.m4
+++ b/topology/sof/pipe-volume-capture.m4
@@ -29,9 +29,9 @@ C_CONTROLMIXER(Master Capture Volume, PIPELINE_ID,
 # Components and Buffers
 #
-# Host "Passthrough Capture" PCM uses pipeline DMAC and channel
+# Host "Passthrough Capture" PCM
 # with 0 sink and 2 source periods
-W_PCM_CAPTURE(PCM_ID, Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 2)
+W_PCM_CAPTURE(PCM_ID, Passthrough Capture, 0, 2, 2)
# "Volume" has 2 source and 2 sink periods
 W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(`		', "Master Capture Volume PIPELINE_ID"))
diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4
index f3203f7..4ebd02d 100644
--- a/topology/sof/pipe-volume-playback.m4
+++ b/topology/sof/pipe-volume-playback.m4
@@ -29,9 +29,9 @@ C_CONTROLMIXER(Master Playback Volume, PIPELINE_ID,
 # Components and Buffers
 #
-# Host "Passthrough Playback" PCM uses pipeline DMAC and channel
+# Host "Passthrough Playback" PCM
 # with 2 sink and 0 source periods
-W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2)
+W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, 2, 0, 2)
# "Volume" has 2 source and 2 sink periods
 W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(`		', "Master Playback Volume PIPELINE_ID"))
diff --git a/topology/sof/tokens.m4 b/topology/sof/tokens.m4
index d1230d8..f0b3428 100644
--- a/topology/sof/tokens.m4
+++ b/topology/sof/tokens.m4
@@ -15,8 +15,6 @@ SectionVendorTokens."sof_buffer_tokens" {
 }
SectionVendorTokens."sof_dai_tokens" {
-	SOF_TKN_DAI_DMAC			"151"
-	SOF_TKN_DAI_DMAC_CHAN			"152"
    SOF_TKN_DAI_DMAC_CONFIG			"153"
    SOF_TKN_DAI_TYPE			"154"
    SOF_TKN_DAI_INDEX			"155"
@@ -43,8 +41,6 @@ SectionVendorTokens."sof_src_tokens" {
 }
SectionVendorTokens."sof_pcm_tokens" {
-	SOF_TKN_PCM_DMAC			"351"
-	SOF_TKN_PCM_DMAC_CHAN			"352"
    SOF_TKN_PCM_DMAC_CONFIG			"353"
 }
diff --git a/topology/test/test-all.m4 b/topology/test/test-all.m4
index 383a397..2a4dae4 100644
--- a/topology/test/test-all.m4
+++ b/topology/test/test-all.m4
@@ -39,21 +39,19 @@ include(`dsps/byt.m4')
# Passthrough playback pipeline 1 on PCM 0 using max 2 channels of s24le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
PIPELINE_PCM_DAI_ADD(sof/pipe-TEST_PIPE_NAME-playback.m4,
    1, 0, 2, TEST_PIPE_FORMAT,
-	48, 1000, 0, 0, 0, 1,
+	48, 1000, 0, 0,
    TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_FORMAT, 2)
# Passthrough playback pipeline 2 on PCM 0 using max 2 channels of s24le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
PIPELINE_PCM_DAI_ADD(sof/pipe-TEST_PIPE_NAME-capture.m4,
    2, 0, 2, TEST_PIPE_FORMAT,
-	48, 1000, 0, 0, 0, 1,
+	48, 1000, 0, 0,
    TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_FORMAT, 2)
#
diff --git a/topology/test/test-capture.m4 b/topology/test/test-capture.m4
index bed59c4..7e5ca86 100644
--- a/topology/test/test-capture.m4
+++ b/topology/test/test-capture.m4
@@ -39,11 +39,10 @@ include(`dsps/byt.m4')
# Passthrough playback pipeline 2 on PCM 0 using max 2 channels of s24le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
PIPELINE_PCM_DAI_ADD(sof/pipe-TEST_PIPE_NAME-capture.m4,
    2, 0, 2, TEST_PIPE_FORMAT,
-	48, 1000, 0, 0, 0, 1,
+	48, 1000, 0, 0,
    TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_FORMAT, 2)
#
diff --git a/topology/test/test-playback.m4 b/topology/test/test-playback.m4
index b0f3fec..ade8a8e 100644
--- a/topology/test/test-playback.m4
+++ b/topology/test/test-playback.m4
@@ -39,11 +39,10 @@ include(`dsps/byt.m4')
# Passthrough playback pipeline 1 on PCM 0 using max 2 channels of s24le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
PIPELINE_PCM_DAI_ADD(sof/pipe-TEST_PIPE_NAME-playback.m4,
    1, 0, 2, TEST_PIPE_FORMAT,
-	48, 1000, 0, 0, 0, 1,
+	48, 1000, 0, 0,
    TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_FORMAT, 2)
 #
 # DAI configuration
-- 
2.17.1


    

Ranjani Sridharan

tags (0)

participants (1)