diff options
author | Mark Brown <broonie@linaro.org> | 2014-01-16 07:42:54 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-01-16 07:42:54 -0500 |
commit | 7cfa7b547337faf5890c8c5f091e081fb79caf73 (patch) | |
tree | b7a701162c0f6eb422417bf16f63b1ca7cc69e44 /drivers/dma | |
parent | 99896f714a0a940d84476bc6208319f70af30789 (diff) | |
parent | d70e861a3154833467023123e218e9b1ba558809 (diff) |
Merge remote-tracking branch 'asoc/topic/dma' into for-tiwai
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/pl330.c | 1 |
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, | |||
2884 | caps->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV); | 2884 | caps->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV); |
2885 | caps->cmd_pause = false; | 2885 | caps->cmd_pause = false; |
2886 | caps->cmd_terminate = true; | 2886 | caps->cmd_terminate = true; |
2887 | caps->residue_granularity = DMA_RESIDUE_GRANULARITY_DESCRIPTOR; | ||
2887 | 2888 | ||
2888 | return 0; | 2889 | return 0; |
2889 | } | 2890 | } |