diff options
| author | Florian Meier <florian.meier@koalo.de> | 2014-01-17 18:06:29 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-01-20 08:01:50 +0100 |
| commit | 7f5ae3553685d54413dda4fc3c98f46056ea716b (patch) | |
| tree | 129f106bd2a2f614bb4dfc8502af225271b1c69f /drivers/dma | |
| parent | dma: imx-sdma: Assign a default script number for ROM firmware cases (diff) | |
| download | linux-7f5ae3553685d54413dda4fc3c98f46056ea716b.tar.xz linux-7f5ae3553685d54413dda4fc3c98f46056ea716b.zip | |
dmaengine: Add DMA_PRIVATE to BCM2835 driver
Without DMA_PRIVATE the driver is not able to allocate more than one channel.
Since it uses dma_get_any_slave_channel that calls private_candidate,
the second allocation fails at
/* some channels are already publicly allocated */
Maybe it should be fixed in the core, but at least this fixes the bug.
Signed-off-by: Florian Meier <florian.meier@koalo.de>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/bcm2835-dma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c index 6ae070825f3f..a03602164e3e 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -611,6 +611,7 @@ static int bcm2835_dma_probe(struct platform_device *pdev) od->base = base; dma_cap_set(DMA_SLAVE, od->ddev.cap_mask); + dma_cap_set(DMA_PRIVATE, od->ddev.cap_mask); dma_cap_set(DMA_CYCLIC, od->ddev.cap_mask); od->ddev.device_alloc_chan_resources = bcm2835_dma_alloc_chan_resources; od->ddev.device_free_chan_resources = bcm2835_dma_free_chan_resources; |