[Sound-open-firmware] [PATCH] topology: src: fix W_SRC widget argument list order

Liam Girdwood liam.r.girdwood at linux.intel.com
Sun Sep 3 23:17:33 CEST 2017


Put format and data in correct order.

Signed-off-by: Liam Girdwood <liam.r.girdwood at linux.intel.com>
---
 topology/m4/local.m4           | 4 ++--
 topology/sof/pipe-pcm-media.m4 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/topology/m4/local.m4 b/topology/m4/local.m4
index 5da77e2..5ff0a3d 100644
--- a/topology/m4/local.m4
+++ b/topology/m4/local.m4
@@ -17,7 +17,7 @@ define(`W_SRC',
 `	tuples."word" {'
 `		SOF_TKN_COMP_PERIOD_SINK_COUNT'		STR($3)
 `		SOF_TKN_COMP_PERIOD_SOURCE_COUNT'	STR($4)
-`		SOF_TKN_COMP_PRELOAD_COUNT'		STR($5)
+`		SOF_TKN_COMP_PRELOAD_COUNT'		STR($6)
 `	}'
 `}'
 `SectionData."'N_SRC($1)`_data_w" {'
@@ -39,7 +39,7 @@ define(`W_SRC',
 `	data ['
 `		"'N_SRC($1)`_data_w"'
 `		"'N_SRC($1)`_data_str"'
-`		"'$2`"'
+`		"'$5`"'
 `	]'
 `}')
 
diff --git a/topology/sof/pipe-pcm-media.m4 b/topology/sof/pipe-pcm-media.m4
index 0ce6faa..4a68eb4 100644
--- a/topology/sof/pipe-pcm-media.m4
+++ b/topology/sof/pipe-pcm-media.m4
@@ -73,7 +73,7 @@ W_PCM_PLAYBACK(Media Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2)
 W_PGA(0, PCM PCM_ID Playback Volume, PIPELINE_FORMAT, 2, 2, 2)
 
 # "SRC 0" has 2 sink and source periods.
-W_SRC(0, media_src_conf, PIPELINE_FORMAT, 2, 2, 2)
+W_SRC(0, PIPELINE_FORMAT, 2, 2, media_src_conf, 2)
 
 # Media Buffers
 W_BUFFER(0, COMP_BUFFER_SIZE(2,
-- 
2.11.0



More information about the Sound-open-firmware mailing list