diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-16 17:54:00 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-01-16 17:54:00 +0400 |
| commit | 2aff4c9ce898b9079658650c1ab33c44b100a203 (patch) | |
| tree | 66f3d8367c315c7fa1267bdb27d0bd923b8ce46f /drivers/dma | |
| parent | c48ae0ab3790efba2dfb1a4709c0ef8da024de1a (diff) | |
| parent | 701caa51a2ce74182d39380ca11defeb163d98c1 (diff) | |
| download | linux-2aff4c9ce898b9079658650c1ab33c44b100a203.tar.xz | |
Merge tag 'asoc-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More updates for v3.14
A few more updates for v3.14 since the last set, highlights include:
- Lots of DMA updates from Lars-Peter
- Improvements to the constraints handling code from Lars-Peter
- A very helpful conversion of the TWL4030 driver to regmap from Peter
- A new driver for the Freescale ESAI controller from Nicolin Chen
- Conversion of some of the drivers to use params_width()
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, 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; } |