[Sound-open-firmware] [PATCH] topology: src: fix W_SRC widget argument list order
Put format and data in correct order.
Signed-off-by: Liam Girdwood liam.r.girdwood@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,
Make sure media buffers can align min period size on 1ms granularity.
Signed-off-by: Liam Girdwood liam.r.girdwood@linux.intel.com --- topology/sof/pipe-pcm-media.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/topology/sof/pipe-pcm-media.m4 b/topology/sof/pipe-pcm-media.m4 index 4a68eb4..5968127 100644 --- a/topology/sof/pipe-pcm-media.m4 +++ b/topology/sof/pipe-pcm-media.m4 @@ -127,7 +127,7 @@ SectionPCMCapabilities.STR(Media Playback PCM_ID) { channels_max "2" periods_min "2" periods_max "32" - period_size_min "4096" + period_size_min "192" period_size_max "262144" buffer_size_min "8388608" buffer_size_max "8388608"
SRC config data was missing "". Fixed.
Signed-off-by: Liam Girdwood liam.r.girdwood@linux.intel.com --- topology/sof/pipe-pcm-media.m4 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/topology/sof/pipe-pcm-media.m4 b/topology/sof/pipe-pcm-media.m4 index 5968127..bde9dd2 100644 --- a/topology/sof/pipe-pcm-media.m4 +++ b/topology/sof/pipe-pcm-media.m4 @@ -51,9 +51,7 @@ SectionVendorTuples."media_src_tokens" { tokens "sof_src_tokens"
tuples."word" { - SOF_TKN_SRC_RATE_IN 16000 - SOF_TKN_SRC_RATE_IN 44100 - SOF_TKN_SRC_RATE_OUT 48000 + SOF_TKN_SRC_RATE_OUT "48000" } }
participants (1)
-
Liam Girdwood