summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-01-16 12:42:54 +0000
committerMark Brown <broonie@linaro.org>2014-01-16 12:42:54 +0000
commit7cfa7b547337faf5890c8c5f091e081fb79caf73 (patch)
treeb7a701162c0f6eb422417bf16f63b1ca7cc69e44 /drivers/dma
parent99896f714a0a940d84476bc6208319f70af30789 (diff)
parentd70e861a3154833467023123e218e9b1ba558809 (diff)
downloadblackbird-op-linux-7cfa7b547337faf5890c8c5f091e081fb79caf73.tar.gz
blackbird-op-linux-7cfa7b547337faf5890c8c5f091e081fb79caf73.zip
Merge remote-tracking branch 'asoc/topic/dma' into for-tiwai
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/pl330.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 536632f6479c..c90edecee463 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -2884,6 +2884,7 @@ static int pl330_dma_device_slave_caps(struct dma_chan *dchan,
caps->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
caps->cmd_pause = false;
caps->cmd_terminate = true;
+ caps->residue_granularity = DMA_RESIDUE_GRANULARITY_DESCRIPTOR;
return 0;
}
OpenPOWER on IntegriCloud