diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-30 12:04:29 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-30 12:04:29 +0200 |
| commit | c85fa502ef8cd81a8e31cd4a71e890f6dea6f140 (patch) | |
| tree | 3cbf8fb661d61cd59b2a146d22f3f9947d5e79d8 /arch | |
| parent | Merge remote-tracking branch 'asoc/topic/kirkwood' into tmp (diff) | |
| parent | ASoC: Samsung: Do not queue cyclic buffers multiple times (diff) | |
| download | linux-c85fa502ef8cd81a8e31cd4a71e890f6dea6f140.tar.xz linux-c85fa502ef8cd81a8e31cd4a71e890f6dea6f140.zip | |
Merge remote-tracking branch 'asoc/topic/samsung' into tmp
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/plat-samsung/s3c-dma-ops.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/s3c-dma-ops.c b/arch/arm/plat-samsung/s3c-dma-ops.c index 0cc40aea3f5a..98b10ba67dc7 100644 --- a/arch/arm/plat-samsung/s3c-dma-ops.c +++ b/arch/arm/plat-samsung/s3c-dma-ops.c @@ -82,7 +82,8 @@ static int s3c_dma_config(unsigned ch, struct samsung_dma_config *param) static int s3c_dma_prepare(unsigned ch, struct samsung_dma_prep *param) { struct cb_data *data; - int len = (param->cap == DMA_CYCLIC) ? param->period : param->len; + dma_addr_t pos = param->buf; + dma_addr_t end = param->buf + param->len; list_for_each_entry(data, &dma_list, node) if (data->ch == ch) @@ -94,7 +95,15 @@ static int s3c_dma_prepare(unsigned ch, struct samsung_dma_prep *param) data->fp_param = param->fp_param; } - s3c2410_dma_enqueue(ch, (void *)data, param->buf, len); + if (param->cap != DMA_CYCLIC) { + s3c2410_dma_enqueue(ch, (void *)data, param->buf, param->len); + return 0; + } + + while (pos < end) { + s3c2410_dma_enqueue(ch, (void *)data, pos, param->period); + pos += param->period; + } return 0; } |