[Sound-open-firmware] [PATCH] topology: fix dai capture tokens and move buffer size macro definition

[Ranjani Sridharan]

This patch fixes typo in dai capture tokens and moves te buffer size
macro definition to buffer.m4

Signed-off-by: Ranjani Sridharan <ranjani.sridharan at linux.intel.com>
---
 topology/dsps/bdw.m4  |  2 +-
 topology/dsps/bxt.m4  |  2 +-
 topology/dsps/byt.m4  |  2 +-
 topology/dsps/cht.m4  |  2 +-
 topology/dsps/cnl.m4  |  2 +-
 topology/dsps/hsw.m4  |  2 +-
 topology/m4/buffer.m4 | 22 ++++++++++++++++++++++
 topology/m4/pcm.m4    | 22 ----------------------
 8 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/topology/dsps/bdw.m4 b/topology/dsps/bdw.m4
index a6022b9..c2bf04e 100644
--- a/topology/dsps/bdw.m4
+++ b/topology/dsps/bdw.m4
@@ -31,7 +31,7 @@ W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	"
 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	"1"'))
+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)
 
diff --git a/topology/dsps/bxt.m4 b/topology/dsps/bxt.m4
index 4d45386..df61d1a 100644
--- a/topology/dsps/bxt.m4
+++ b/topology/dsps/bxt.m4
@@ -34,7 +34,7 @@ W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	"
 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	"1"'))
+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)
 
diff --git a/topology/dsps/byt.m4 b/topology/dsps/byt.m4
index ab707f8..d1d4886 100644
--- a/topology/dsps/byt.m4
+++ b/topology/dsps/byt.m4
@@ -31,7 +31,7 @@ W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	"
 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	"1"'))
+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)
 
diff --git a/topology/dsps/cht.m4 b/topology/dsps/cht.m4
index 41529dc..4ed114f 100644
--- a/topology/dsps/cht.m4
+++ b/topology/dsps/cht.m4
@@ -31,7 +31,7 @@ W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	"
 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	"1"'))
+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)
 
diff --git a/topology/dsps/cnl.m4 b/topology/dsps/cnl.m4
index 431db32..41ece94 100644
--- a/topology/dsps/cnl.m4
+++ b/topology/dsps/cnl.m4
@@ -35,7 +35,7 @@ W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	"
 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	"1"'))
+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)
 
diff --git a/topology/dsps/hsw.m4 b/topology/dsps/hsw.m4
index 5db318f..754fc41 100644
--- a/topology/dsps/hsw.m4
+++ b/topology/dsps/hsw.m4
@@ -31,7 +31,7 @@ W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(`		', `SOF_TKN_DAI_DMAC	"
 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	"1"'))
+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)
 
diff --git a/topology/m4/buffer.m4 b/topology/m4/buffer.m4
index fc06ba0..4bfd212 100644
--- a/topology/m4/buffer.m4
+++ b/topology/m4/buffer.m4
@@ -26,4 +26,26 @@ define(`W_BUFFER',
 `	]'
 `}')
 
+dnl COMP_BUFFER_SIZE( num_periods, sample_size, channels, fmames)
+define(`COMP_BUFFER_SIZE', `eval(`$1 * $2 * $3 * $4')')
+
+dnl PCM_PLAYBACK_ADD(name, pipeline, pcm_id, dai_id, playback)
+define(`PCM_PLAYBACK_ADD',
+`SectionPCM.STR($1) {'
+`'
+`	index STR($2)'
+`'
+`	# used for binding to the PCM'
+`	id STR($3)'
+`'
+`	dai.STR($1 $3) {'
+`		id STR($4)'
+`	}'
+`'
+`	pcm."playback" {'
+`'
+`		capabilities STR($5)'
+`	}'
+`}')
+
 divert(0)dnl
diff --git a/topology/m4/pcm.m4 b/topology/m4/pcm.m4
index d767350..596f2fe 100644
--- a/topology/m4/pcm.m4
+++ b/topology/m4/pcm.m4
@@ -93,28 +93,6 @@ define(`PCM_CAPABILITIES',
 `	buffer_size_max	STR($12)'
 `}')
 
-dnl COMP_BUFFER_SIZE( num_periods, sample_size, channels, fmames)
-define(`COMP_BUFFER_SIZE', `eval(`$1 * $2 * $3 * $4')')
-
-dnl PCM_PLAYBACK_ADD(name, pipeline, pcm_id, dai_id, playback)
-define(`PCM_PLAYBACK_ADD',
-`SectionPCM.STR($1) {'
-`'
-`	index STR($2)'
-`'
-`	# used for binding to the PCM'
-`	id STR($3)'
-`'
-`	dai.STR($1 $3) {'
-`		id STR($4)'
-`	}'
-`'
-`	pcm."playback" {'
-`'
-`		capabilities STR($5)'
-`	}'
-`}')
-
 dnl PCM_CAPTURE_ADD(name, pipeline, pcm_id, dai_id, capture)
 define(`PCM_CAPTURE_ADD',
 `SectionPCM.STR($1) {'
-- 
2.14.1