[Sound-open-firmware] [PATCH 2/6] topology: remove stream_name for all DAI definitions
Pierre-Louis Bossart
pierre-louis.bossart at linux.intel.com
Thu Dec 7 02:41:05 CET 2017
stream_name is not used by any machine drivers, there is no point in
providing the information to topology layers
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart at linux.intel.com>
---
topology/m4/build.m4 | 26 +++----
topology/m4/local.m4 | 98 ++++++++++++-------------
topology/reef-apl-nocodec.m4 | 8 +-
topology/reef-bdw-rt286.m4 | 8 +-
topology/reef-bdw-rt5640.m4 | 8 +-
topology/reef-bxt-nocodec.m4 | 8 +-
topology/reef-byt-nocodec.m4 | 8 +-
topology/reef-byt-rt5640.m4 | 8 +-
topology/reef-byt-rt5651.m4 | 8 +-
topology/reef-cht-nocodec.m4 | 8 +-
topology/reef-hsw-rt5640.m4 | 8 +-
topology/sof/pipe-dai-capture.m4 | 2 +-
topology/sof/pipe-dai-playback.m4 | 2 +-
topology/sof/pipe-passthrough-playback.m4 | 2 +-
topology/sof/pipe-passthrough-src-playback.m4 | 2 +-
topology/sof/pipe-passthrough-vol-playback.m4 | 2 +-
topology/test-passthrough-16bit-48k-ssp2.m4 | 5 +-
topology/test-passthrough-24bit-48k-src-ssp2.m4 | 6 +-
topology/test-passthrough-24bit-48k-ssp2.m4 | 5 +-
topology/test-passthrough-24bit-48k-vol-ssp2.m4 | 6 +-
20 files changed, 104 insertions(+), 124 deletions(-)
diff --git a/topology/m4/build.m4 b/topology/m4/build.m4
index d6801de..9361219 100644
--- a/topology/m4/build.m4
+++ b/topology/m4/build.m4
@@ -30,7 +30,7 @@ define(`PIPELINE_PCM_ADD',
dnl PIPELINE_PCM_DAI_ADD(pipeline,
dnl pipe id, pcm, max channels, format,
dnl frames, deadline, priority, core, dmac, dmac_chan,
-dnl dai type, dai_index, stream_name, dai format, periods)
+dnl dai type, dai_index, dai format, periods)
define(`PIPELINE_PCM_DAI_ADD',
`undefine(`PCM_ID')'
`undefine(`PIPELINE_ID')'
@@ -44,7 +44,6 @@ define(`PIPELINE_PCM_DAI_ADD',
`undefine(`PIPELINE_DMAC_CHAN')'
`undefine(`DAI_TYPE')'
`undefine(`DAI_INDEX')'
-`undefine(`DAI_SNAME')'
`undefine(`DAI_FORMAT')'
`undefine(`DAI_PERIODS')'
`define(`PIPELINE_ID', $2)'
@@ -59,9 +58,8 @@ define(`PIPELINE_PCM_DAI_ADD',
`define(`PIPELINE_DMAC_CHAN', $11)'
`define(`DAI_TYPE', STR($12))'
`define(`DAI_INDEX', STR($13))'
-`define(`DAI_SNAME', $14)'
-`define(`DAI_FORMAT', $15)'
-`define(`DAI_PERIODS', $16)'
+`define(`DAI_FORMAT', $14)'
+`define(`DAI_PERIODS', $15)'
`define(`DAI_NAME', $12$13)'
`include($1)'
)
@@ -88,14 +86,13 @@ define(`PIPELINE_ADD',
)
dnl DAI_ADD(pipeline,
-dnl pipe id, dai type, dai_index, stream_name,
+dnl pipe id, dai type, dai_index,
dnl buffer, periods, format,
dnl frames, deadline, priority, core)
define(`DAI_ADD',
`undefine(`PIPELINE_ID')'
`undefine(`DAI_TYPE')'
`undefine(`DAI_INDEX')'
-`undefine(`DAI_SNAME')'
`undefine(`DAI_BUF')'
`undefine(`DAI_PERIODS')'
`undefine(`DAI_FORMAT')'
@@ -106,15 +103,14 @@ define(`DAI_ADD',
`define(`PIPELINE_ID', $2)'
`define(`DAI_TYPE', STR($3))'
`define(`DAI_INDEX', STR($4))'
-`define(`DAI_SNAME', $5)'
-`define(`DAI_BUF', $6)'
+`define(`DAI_BUF', $5)'
`define(`DAI_NAME', $3$4)'
-`define(`DAI_PERIODS', $7)'
-`define(`DAI_FORMAT', $8)'
-`define(`SCHEDULE_FRAMES', $9)'
-`define(`SCHEDULE_DEADLINE', $10)'
-`define(`SCHEDULE_PRIORITY', $11)'
-`define(`SCHEDULE_CORE', $12)'
+`define(`DAI_PERIODS', $6)'
+`define(`DAI_FORMAT', $7)'
+`define(`SCHEDULE_FRAMES', $8)'
+`define(`SCHEDULE_DEADLINE', $9)'
+`define(`SCHEDULE_PRIORITY', $10)'
+`define(`SCHEDULE_CORE', $11)'
`include($1)'
)
diff --git a/topology/m4/local.m4 b/topology/m4/local.m4
index e31ba0e..da20e1c 100644
--- a/topology/m4/local.m4
+++ b/topology/m4/local.m4
@@ -257,111 +257,109 @@ define(`N_DAI', DAI_NAME)
define(`N_DAI_OUT', DAI_NAME`.OUT')
define(`N_DAI_IN', DAI_NAME`.IN')
-dnl W_DAI_OUT(stream, type, index, format, periods_sink, periods_source, preload, data)
+dnl W_DAI_OUT(type, index, format, periods_sink, periods_source, preload, data)
define(`W_DAI_OUT',
-`SectionVendorTuples."'N_DAI_OUT($1)`_tuples_w_comp" {'
+`SectionVendorTuples."'N_DAI_OUT($2)`_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($4)
+` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($5)
+` SOF_TKN_COMP_PRELOAD_COUNT' STR($6)
` }'
`}'
-`SectionData."'N_DAI_OUT($1)`_data_w_comp" {'
-` tuples "'N_DAI_OUT($1)`_tuples_w_comp"'
+`SectionData."'N_DAI_OUT($2)`_data_w_comp" {'
+` tuples "'N_DAI_OUT($2)`_tuples_w_comp"'
`}'
-`SectionVendorTuples."'N_DAI_OUT($1)`_tuples_w" {'
+`SectionVendorTuples."'N_DAI_OUT($2)`_tuples_w" {'
` tokens "sof_dai_tokens"'
` tuples."word" {'
-` SOF_TKN_DAI_INDEX' $3
+` SOF_TKN_DAI_INDEX' $2
` }'
`}'
-`SectionData."'N_DAI_OUT($1)`_data_w" {'
-` tuples "'N_DAI_OUT($1)`_tuples_w"'
+`SectionData."'N_DAI_OUT($2)`_data_w" {'
+` tuples "'N_DAI_OUT($2)`_tuples_w"'
`}'
-`SectionVendorTuples."'N_DAI_OUT($1)`_tuples_str" {'
+`SectionVendorTuples."'N_DAI_OUT($2)`_tuples_str" {'
` tokens "sof_dai_tokens"'
` tuples."string" {'
-` SOF_TKN_DAI_TYPE' $2
+` SOF_TKN_DAI_TYPE' $1
` }'
`}'
-`SectionData."'N_DAI_OUT($1)`_data_str" {'
-` tuples "'N_DAI_OUT($1)`_tuples_str"'
+`SectionData."'N_DAI_OUT($2)`_data_str" {'
+` tuples "'N_DAI_OUT($2)`_tuples_str"'
`}'
-`SectionVendorTuples."'N_DAI_OUT($1)`_tuples_comp_str" {'
+`SectionVendorTuples."'N_DAI_OUT($2)`_tuples_comp_str" {'
` tokens "sof_comp_tokens"'
` tuples."string" {'
-` SOF_TKN_COMP_FORMAT' STR($4)
+` SOF_TKN_COMP_FORMAT' STR($3)
` }'
`}'
-`SectionData."'N_DAI_OUT($1)`_data_comp_str" {'
-` tuples "'N_DAI_OUT($1)`_tuples_comp_str"'
+`SectionData."'N_DAI_OUT($2)`_data_comp_str" {'
+` tuples "'N_DAI_OUT($2)`_tuples_comp_str"'
`}'
`SectionWidget."'N_DAI_OUT`" {'
` index "'PIPELINE_ID`"'
` type "dai_in"'
` no_pm "true"'
-` stream_name "'$1`"'
` data ['
-` "'N_DAI_OUT($1)`_data_w"'
-` "'N_DAI_OUT($1)`_data_w_comp"'
-` "'N_DAI_OUT($1)`_data_str"'
-` "'N_DAI_OUT($1)`_data_comp_str"'
-` "'$8`"'
+` "'N_DAI_OUT($2)`_data_w"'
+` "'N_DAI_OUT($2)`_data_w_comp"'
+` "'N_DAI_OUT($2)`_data_str"'
+` "'N_DAI_OUT($2)`_data_comp_str"'
+` "'$7`"'
` ]'
`}')
-dnl W_DAI_IN(stream, type, index, format, periods_sink, periods_source, preload, data)
+dnl W_DAI_IN(type, index, format, periods_sink, periods_source, preload, data)
define(`W_DAI_IN',
-`SectionVendorTuples."'N_DAI_IN($1)`_tuples_w_comp" {'
+`SectionVendorTuples."'N_DAI_IN($2)`_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($4)
+` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($5)
+` SOF_TKN_COMP_PRELOAD_COUNT' STR($6)
` }'
`}'
-`SectionData."'N_DAI_IN($1)`_data_w_comp" {'
-` tuples "'N_DAI_IN($1)`_tuples_w_comp"'
+`SectionData."'N_DAI_IN($2)`_data_w_comp" {'
+` tuples "'N_DAI_IN($2)`_tuples_w_comp"'
`}'
-`SectionVendorTuples."'N_DAI_IN($1)`_tuples_w" {'
+`SectionVendorTuples."'N_DAI_IN($2)`_tuples_w" {'
` tokens "sof_dai_tokens"'
` tuples."word" {'
-` SOF_TKN_DAI_INDEX' $3
+` SOF_TKN_DAI_INDEX' $2
` }'
`}'
-`SectionData."'N_DAI_IN($1)`_data_w" {'
-` tuples "'N_DAI_IN($1)`_tuples_w"'
+`SectionData."'N_DAI_IN($2)`_data_w" {'
+` tuples "'N_DAI_IN($2)`_tuples_w"'
`}'
-`SectionVendorTuples."'N_DAI_IN($1)`_tuples_str" {'
+`SectionVendorTuples."'N_DAI_IN($2)`_tuples_str" {'
` tokens "sof_dai_tokens"'
` tuples."string" {'
-` SOF_TKN_DAI_TYPE' $2
+` SOF_TKN_DAI_TYPE' $1
` }'
`}'
-`SectionData."'N_DAI_IN($1)`_data_str" {'
-` tuples "'N_DAI_IN($1)`_tuples_str"'
+`SectionData."'N_DAI_IN($2)`_data_str" {'
+` tuples "'N_DAI_IN($2)`_tuples_str"'
`}'
-`SectionVendorTuples."'N_DAI_IN($1)`_tuples_comp_str" {'
+`SectionVendorTuples."'N_DAI_IN($2)`_tuples_comp_str" {'
` tokens "sof_comp_tokens"'
` tuples."string" {'
-` SOF_TKN_COMP_FORMAT' STR($4)
+` SOF_TKN_COMP_FORMAT' STR($3)
` }'
`}'
-`SectionData."'N_DAI_IN($1)`_data_comp_str" {'
-` tuples "'N_DAI_IN($1)`_tuples_comp_str"'
+`SectionData."'N_DAI_IN($2)`_data_comp_str" {'
+` tuples "'N_DAI_IN($2)`_tuples_comp_str"'
`}'
`SectionWidget."'N_DAI_IN`" {'
` index "'PIPELINE_ID`"'
` type "dai_out"'
` no_pm "true"'
-` stream_name "'$1`"'
` data ['
-` "'N_DAI_IN($1)`_data_w"'
-` "'N_DAI_IN($1)`_data_w_comp"'
-` "'N_DAI_IN($1)`_data_str"'
-` "'N_DAI_OUT($1)`_data_comp_str"'
-` "'$8`"'
+` "'N_DAI_IN($2)`_data_w"'
+` "'N_DAI_IN($2)`_data_w_comp"'
+` "'N_DAI_IN($2)`_data_str"'
+` "'N_DAI_OUT($2)`_data_comp_str"'
+` "'$7`"'
` ]'
`}')
diff --git a/topology/reef-apl-nocodec.m4 b/topology/reef-apl-nocodec.m4
index b62d9ed..89ac0b0 100644
--- a/topology/reef-apl-nocodec.m4
+++ b/topology/reef-apl-nocodec.m4
@@ -83,17 +83,17 @@ SectionGraph."pipe-apl-nocodec" {
# SSP port 2 is our only pipeline DAI
#
-# playback DAI is SSP2 using I2S DAPM stream and 2 periods
+# playback DAI is SSP2 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,
- 1, SSP, 2, I2S,
+ 1, SSP, 2,
PIPELINE_SOURCE_1, 2, s24le,
48, 1000, 0, 0)
-# capture DAI is SSP2 using I2S DAPM stream and 2 periods
+# capture DAI is SSP2 using 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
- 2, SSP, 2, I2S,
+ 2, SSP, 2,
PIPELINE_SINK_2, 2, s24le,
48, 1000, 0, 0)
diff --git a/topology/reef-bdw-rt286.m4 b/topology/reef-bdw-rt286.m4
index 16b5dd1..969d5e0 100644
--- a/topology/reef-bdw-rt286.m4
+++ b/topology/reef-bdw-rt286.m4
@@ -83,17 +83,17 @@ SectionGraph."pipe-bdw-rt286" {
# SSP port 0 is our only pipeline DAI
#
-# playback DAI is SSP0 using I2S DAPM stream and 2 periods
+# playback DAI is SSP0 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,
- 1, SSP, 0, I2S,
+ 1, SSP, 0,
PIPELINE_SOURCE_1, 2, s24le,
48, 1000, 0, 0)
-# capture DAI is SSP0 using I2S DAPM stream and 2 periods
+# capture DAI is SSP0 using 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
- 2, SSP, 0, I2S,
+ 2, SSP, 0,
PIPELINE_SINK_2, 2, s24le,
48, 1000, 0, 0)
diff --git a/topology/reef-bdw-rt5640.m4 b/topology/reef-bdw-rt5640.m4
index f0071ee..acf2462 100644
--- a/topology/reef-bdw-rt5640.m4
+++ b/topology/reef-bdw-rt5640.m4
@@ -83,17 +83,17 @@ SectionGraph."pipe-bdw-rt5640" {
# SSP port 0 is our only pipeline DAI
#
-# playback DAI is SSP0 using I2S DAPM stream and 2 periods
+# playback DAI is SSP0 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,
- 1, SSP, 0, I2S,
+ 1, SSP, 0,
PIPELINE_SOURCE_1, 2, s24le,
48, 1000, 0, 0)
-# capture DAI is SSP0 using I2S DAPM stream and 2 periods
+# capture DAI is SSP0 using 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
- 2, SSP, 0, I2S,
+ 2, SSP, 0,
PIPELINE_SINK_2, 2, s24le,
48, 1000, 0, 0)
diff --git a/topology/reef-bxt-nocodec.m4 b/topology/reef-bxt-nocodec.m4
index ff506dd..86cc364 100644
--- a/topology/reef-bxt-nocodec.m4
+++ b/topology/reef-bxt-nocodec.m4
@@ -83,17 +83,17 @@ SectionGraph."pipe-bxt-nocodec" {
# SSP port 2 is our only pipeline DAI
#
-# playback DAI is SSP2 using I2S DAPM stream and 2 periods
+# playback DAI is SSP2 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,
- 1, SSP, 2, I2S,
+ 1, SSP, 2,
PIPELINE_SOURCE_1, 2, s24le,
48, 1000, 0, 0)
-# capture DAI is SSP2 using I2S DAPM stream and 2 periods
+# capture DAI is SSP2 using 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
- 2, SSP, 2, I2S,
+ 2, SSP, 2,
PIPELINE_SINK_2, 2, s24le,
48, 1000, 0, 0)
diff --git a/topology/reef-byt-nocodec.m4 b/topology/reef-byt-nocodec.m4
index 17203f5..56aee22 100644
--- a/topology/reef-byt-nocodec.m4
+++ b/topology/reef-byt-nocodec.m4
@@ -72,17 +72,17 @@ SectionGraph."pipe-byt-nocodec" {
# SSP port 2 is our only pipeline DAI
#
-# playback DAI is SSP2 using I2S DAPM stream and 2 periods
+# playback DAI is SSP2 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,
- 1, SSP, 2, I2S,
+ 1, SSP, 2,
PIPELINE_SOURCE_1, 2, s24le,
48, 1000, 0, 0)
-# capture DAI is SSP2 using I2S DAPM stream and 2 periods
+# capture DAI is SSP2 using 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
- 2, SSP, 2, I2S,
+ 2, SSP, 2,
PIPELINE_SINK_2, 2, s24le,
48, 1000, 0, 0)
diff --git a/topology/reef-byt-rt5640.m4 b/topology/reef-byt-rt5640.m4
index 3234b94..f8d0e40 100644
--- a/topology/reef-byt-rt5640.m4
+++ b/topology/reef-byt-rt5640.m4
@@ -72,17 +72,17 @@ SectionGraph."pipe-byt-rt5640" {
# SSP port 2 is our only pipeline DAI
#
-# playback DAI is SSP2 using I2S DAPM stream and 2 periods
+# playback DAI is SSP2 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,
- 1, SSP, 2, Audio,
+ 1, SSP, 2,
PIPELINE_SOURCE_1, 2, s24le,
48, 1000, 0, 0)
-# capture DAI is SSP2 using I2S DAPM stream and 2 periods
+# capture DAI is SSP2 using 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
- 2, SSP, 2, Audio,
+ 2, SSP, 2,
PIPELINE_SINK_2, 2, s24le,
48, 1000, 0, 0)
diff --git a/topology/reef-byt-rt5651.m4 b/topology/reef-byt-rt5651.m4
index 26ea742..ccac260 100644
--- a/topology/reef-byt-rt5651.m4
+++ b/topology/reef-byt-rt5651.m4
@@ -72,17 +72,17 @@ SectionGraph."pipe-byt-rt5651" {
# SSP port 2 is our only pipeline DAI
#
-# playback DAI is SSP2 using "Audio" DAPM stream name and 2 periods
+# playback DAI is SSP2 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,
- 1, SSP, 2, Audio,
+ 1, SSP, 2,
PIPELINE_SOURCE_1, 2, s24le,
48, 1000, 0, 0)
-# capture DAI is SSP2 using "Audio" DAPM stream name and 2 periods
+# capture DAI is SSP2 using 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
- 2, SSP, 2, Audio,
+ 2, SSP, 2,
PIPELINE_SINK_2, 2, s24le,
48, 1000, 0, 0)
diff --git a/topology/reef-cht-nocodec.m4 b/topology/reef-cht-nocodec.m4
index 908c037..24560ee 100644
--- a/topology/reef-cht-nocodec.m4
+++ b/topology/reef-cht-nocodec.m4
@@ -72,17 +72,17 @@ SectionGraph."pipe-cht-nocodec" {
# SSP port 2 is our only pipeline DAI
#
-# playback DAI is SSP2 using I2S DAPM stream and 2 periods
+# playback DAI is SSP2 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,
- 1, SSP, 2, I2S,
+ 1, SSP, 2,
PIPELINE_SOURCE_1, 2, s24le,
48, 1000, 0, 0)
-# capture DAI is SSP2 using I2S DAPM stream and 2 periods
+# capture DAI is SSP2 using 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
- 2, SSP, 2, I2S,
+ 2, SSP, 2,
PIPELINE_SINK_2, 2, s24le,
48, 1000, 0, 0)
diff --git a/topology/reef-hsw-rt5640.m4 b/topology/reef-hsw-rt5640.m4
index 13d073a..8759704 100644
--- a/topology/reef-hsw-rt5640.m4
+++ b/topology/reef-hsw-rt5640.m4
@@ -83,17 +83,17 @@ SectionGraph."pipe-hsw-rt5640" {
# SSP port 0 is our only pipeline DAI
#
-# playback DAI is SSP0 using I2S DAPM stream and 2 periods
+# playback DAI is SSP0 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,
- 1, SSP, 0, I2S,
+ 1, SSP, 0,
PIPELINE_SOURCE_1, 2, s24le,
48, 1000, 0, 0)
-# capture DAI is SSP0 using I2S DAPM stream and 2 periods
+# capture DAI is SSP0 using 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
- 2, SSP, 0, I2S,
+ 2, SSP, 0,
PIPELINE_SINK_2, 2, s24le,
48, 1000, 0, 0)
diff --git a/topology/sof/pipe-dai-capture.m4 b/topology/sof/pipe-dai-capture.m4
index 45c6ff4..ab63efd 100644
--- a/topology/sof/pipe-dai-capture.m4
+++ b/topology/sof/pipe-dai-capture.m4
@@ -6,7 +6,7 @@ include(`local.m4')
#
# DAI definitions
#
-W_DAI_IN(DAI_SNAME, DAI_TYPE, DAI_INDEX, DAI_FORMAT, 2, 0, 0, dai0c_plat_conf)
+W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_FORMAT, 2, 0, 0, dai0c_plat_conf)
#
# DAI pipeline - always use 0 for DAIs
diff --git a/topology/sof/pipe-dai-playback.m4 b/topology/sof/pipe-dai-playback.m4
index f99aac0..3a7a158 100644
--- a/topology/sof/pipe-dai-playback.m4
+++ b/topology/sof/pipe-dai-playback.m4
@@ -6,7 +6,7 @@ include(`local.m4')
#
# DAI definitions
#
-W_DAI_OUT(DAI_SNAME, DAI_TYPE, DAI_INDEX, DAI_FORMAT, 0, 2, 2, dai0p_plat_conf)
+W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_FORMAT, 0, 2, 2, dai0p_plat_conf)
#
# DAI pipeline - always use 0 for DAIs
diff --git a/topology/sof/pipe-passthrough-playback.m4 b/topology/sof/pipe-passthrough-playback.m4
index 4e6e705..2b34cef 100644
--- a/topology/sof/pipe-passthrough-playback.m4
+++ b/topology/sof/pipe-passthrough-playback.m4
@@ -23,7 +23,7 @@ W_BUFFER(0, COMP_BUFFER_SIZE(2,
#
# DAI definitions
#
-W_DAI_OUT(DAI_SNAME, DAI_TYPE, DAI_INDEX, DAI_FORMAT, 0, 2, 2, dai0p_plat_conf)
+W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_FORMAT, 0, 2, 2, dai0p_plat_conf)
#
# DAI pipeline - always use 0 for DAIs
diff --git a/topology/sof/pipe-passthrough-src-playback.m4 b/topology/sof/pipe-passthrough-src-playback.m4
index 3cadaf2..b8fae58 100644
--- a/topology/sof/pipe-passthrough-src-playback.m4
+++ b/topology/sof/pipe-passthrough-src-playback.m4
@@ -44,7 +44,7 @@ W_BUFFER(1, COMP_BUFFER_SIZE(4,
#
# DAI definitions
#
-W_DAI_OUT(DAI_SNAME, DAI_TYPE, DAI_INDEX, DAI_FORMAT, 0, DAI_PERIODS,
+W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_FORMAT, 0, DAI_PERIODS,
DAI_PERIODS, dai0p_plat_conf)
#
diff --git a/topology/sof/pipe-passthrough-vol-playback.m4 b/topology/sof/pipe-passthrough-vol-playback.m4
index f0e39e8..6e8aba4 100644
--- a/topology/sof/pipe-passthrough-vol-playback.m4
+++ b/topology/sof/pipe-passthrough-vol-playback.m4
@@ -58,7 +58,7 @@ W_BUFFER(1, COMP_BUFFER_SIZE(2,
#
# DAI definitions
#
-W_DAI_OUT(DAI_SNAME, DAI_TYPE, DAI_INDEX, DAI_FORMAT, 0, DAI_PERIODS,
+W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_FORMAT, 0, DAI_PERIODS,
DAI_PERIODS, dai0p_plat_conf)
#
diff --git a/topology/test-passthrough-16bit-48k-ssp2.m4 b/topology/test-passthrough-16bit-48k-ssp2.m4
index bf4963b..7bf4aaf 100644
--- a/topology/test-passthrough-16bit-48k-ssp2.m4
+++ b/topology/test-passthrough-16bit-48k-ssp2.m4
@@ -22,9 +22,6 @@ include(`dsps/byt.m4')
# DAI Link Name
define(`TEST_DAI_LINK_NAME', `Baytrail Audio')
-# DAI Link Stream Name
-define(`TEST_DAI_LINK_STREAM_NAME', `Audio')
-
#
# Define the pipeline
#
@@ -38,7 +35,7 @@ define(`TEST_DAI_LINK_STREAM_NAME', `Audio')
PIPELINE_PCM_DAI_ADD(sof/pipe-passthrough-playback.m4,
1, 0, 2, s16le,
48, 1000, 0, 0, 0, 1,
- SSP, 2, TEST_DAI_LINK_STREAM_NAME, s16le, 2)
+ SSP, 2, s16le, 2)
#
# BE configurations - overrides config in ACPI if present
diff --git a/topology/test-passthrough-24bit-48k-src-ssp2.m4 b/topology/test-passthrough-24bit-48k-src-ssp2.m4
index bcaed51..61c06e1 100644
--- a/topology/test-passthrough-24bit-48k-src-ssp2.m4
+++ b/topology/test-passthrough-24bit-48k-src-ssp2.m4
@@ -22,10 +22,6 @@ include(`dsps/byt.m4')
# DAI Link Name
define(`TEST_DAI_LINK_NAME', `Baytrail Audio')
-# DAI Link Stream Name
-define(`TEST_DAI_LINK_STREAM_NAME', `Audio')
-
-
#
# Define the pipeline
#
@@ -39,7 +35,7 @@ define(`TEST_DAI_LINK_STREAM_NAME', `Audio')
PIPELINE_PCM_DAI_ADD(sof/pipe-passthrough-src-playback.m4,
1, 0, 2, s24le,
48, 1000, 0, 0, 0, 1,
- SSP, 2, TEST_DAI_LINK_STREAM_NAME, s24le, 2)
+ SSP, 2, s24le, 2)
#
# BE configurations - overrides config in ACPI if present
diff --git a/topology/test-passthrough-24bit-48k-ssp2.m4 b/topology/test-passthrough-24bit-48k-ssp2.m4
index 74c3b1a..ca3261d 100644
--- a/topology/test-passthrough-24bit-48k-ssp2.m4
+++ b/topology/test-passthrough-24bit-48k-ssp2.m4
@@ -22,9 +22,6 @@ include(`dsps/byt.m4')
# DAI Link Name
define(`TEST_DAI_LINK_NAME', `Baytrail Audio')
-# DAI Link Stream Name
-define(`TEST_DAI_LINK_STREAM_NAME', `Audio')
-
#
# Define the pipeline
#
@@ -38,7 +35,7 @@ define(`TEST_DAI_LINK_STREAM_NAME', `Audio')
PIPELINE_PCM_DAI_ADD(sof/pipe-passthrough-playback.m4,
1, 0, 2, s24le,
48, 1000, 0, 0, 0, 1,
- SSP, 2, TEST_DAI_LINK_STREAM_NAME, s24le, 2)
+ SSP, 2, s24le, 2)
#
# BE configurations - overrides config in ACPI if present
diff --git a/topology/test-passthrough-24bit-48k-vol-ssp2.m4 b/topology/test-passthrough-24bit-48k-vol-ssp2.m4
index 3ff80fc..7071782 100644
--- a/topology/test-passthrough-24bit-48k-vol-ssp2.m4
+++ b/topology/test-passthrough-24bit-48k-vol-ssp2.m4
@@ -22,10 +22,6 @@ include(`dsps/byt.m4')
# DAI Link Name
define(`TEST_DAI_LINK_NAME', `Baytrail Audio')
-# DAI Link Stream Name
-define(`TEST_DAI_LINK_STREAM_NAME', `Audio')
-
-
#
# Define the pipeline
#
@@ -39,7 +35,7 @@ define(`TEST_DAI_LINK_STREAM_NAME', `Audio')
PIPELINE_PCM_DAI_ADD(sof/pipe-passthrough-vol-playback.m4,
1, 0, 2, s24le,
48, 1000, 0, 0, 0, 1,
- SSP, 2, TEST_DAI_LINK_STREAM_NAME, s24le, 2)
+ SSP, 2, s24le, 2)
#
# BE configurations - overrides config in ACPI if present
--
2.14.1
More information about the Sound-open-firmware
mailing list