summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2017-02-21 21:14:07 +0530
committerVinod Koul <vinod.koul@intel.com>2017-02-21 21:14:07 +0530
commit25036f2a7377d7135ce9848d58d14b5bc061541d (patch)
treea55bcacba1c8a74dcb2d18e10b6eaabee07cccc4 /drivers/dma
parente4e48c47d15df1dd5f74d3b5e8fc4c7817f45133 (diff)
parent15c606686541d49cc38465a3cfe25c23bff4395b (diff)
downloadblackbird-op-linux-25036f2a7377d7135ce9848d58d14b5bc061541d.tar.gz
blackbird-op-linux-25036f2a7377d7135ce9848d58d14b5bc061541d.zip
Merge branch 'topic/ste' into for-linus
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/ste_dma40.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index 8684d11b29bb..a6620b671d1d 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -2809,12 +2809,14 @@ static void __init d40_chan_init(struct d40_base *base, struct dma_device *dma,
static void d40_ops_init(struct d40_base *base, struct dma_device *dev)
{
- if (dma_has_cap(DMA_SLAVE, dev->cap_mask))
+ if (dma_has_cap(DMA_SLAVE, dev->cap_mask)) {
dev->device_prep_slave_sg = d40_prep_slave_sg;
+ dev->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
+ }
if (dma_has_cap(DMA_MEMCPY, dev->cap_mask)) {
dev->device_prep_dma_memcpy = d40_prep_memcpy;
-
+ dev->directions = BIT(DMA_MEM_TO_MEM);
/*
* This controller can only access address at even
* 32bit boundaries, i.e. 2^2
@@ -2836,6 +2838,7 @@ static void d40_ops_init(struct d40_base *base, struct dma_device *dev)
dev->device_pause = d40_pause;
dev->device_resume = d40_resume;
dev->device_terminate_all = d40_terminate_all;
+ dev->residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
dev->dev = base->dev;
}
OpenPOWER on IntegriCloud