summaryrefslogtreecommitdiff
path: root/drivers/dma
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2017-12-01 01:02:04 +0800
committerAlex Shi <alex.shi@linaro.org>2017-12-01 01:02:04 +0800
commit0f646885c342e74051e3d40acd40af310469526d (patch)
treed584727a1b291b524f5dde014725c53baa02b5f1 /drivers/dma
parent00236b01de65d53e3cde74900c7b0be059abcf6b (diff)
parent81ab793d6dcb61c8ca908b442cc7b98be7ffa02c (diff)
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/zx296702_dma.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/zx296702_dma.c b/drivers/dma/zx296702_dma.c
index 245d759d5ffc..6059d81e701a 100644
--- a/drivers/dma/zx296702_dma.c
+++ b/drivers/dma/zx296702_dma.c
@@ -813,6 +813,7 @@ static int zx_dma_probe(struct platform_device *op)
INIT_LIST_HEAD(&d->slave.channels);
dma_cap_set(DMA_SLAVE, d->slave.cap_mask);
dma_cap_set(DMA_MEMCPY, d->slave.cap_mask);
+ dma_cap_set(DMA_CYCLIC, d->slave.cap_mask);
dma_cap_set(DMA_PRIVATE, d->slave.cap_mask);
d->slave.dev = &op->dev;
d->slave.device_free_chan_resources = zx_dma_free_chan_resources;