Merge remote-tracking branch 'asoc/topic/dma' into for-tiwai

2014-01-16 12:42:54 +00:00
parent 99896f714a d70e861a31
commit 7cfa7b5473
6 changed files with 73 additions and 29 deletions
--- 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;
 }