diff options
| author | Ludovic Desroches <ludovic.desroches@atmel.com> | 2014-11-13 11:52:45 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-11-17 09:37:21 +0100 |
| commit | fef4cbf2ab830fcd695d892927386ad9ccc46339 (patch) | |
| tree | 0b262524389d8d8a62f14485da8c4774e6589c0f /drivers/dma | |
| parent | ARM: dts: at_xdmac: fix bad value of dma-cells in documentation (diff) | |
| download | linux-fef4cbf2ab830fcd695d892927386ad9ccc46339.tar.xz linux-fef4cbf2ab830fcd695d892927386ad9ccc46339.zip | |
dmaengine: at_xdmac: Add DMA_PRIVATE
same issue as commit 7f5ae3553685:
"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 */
"
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/at_xdmac.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c index 586275fe1120..b60d77a22df6 100644 --- a/drivers/dma/at_xdmac.c +++ b/drivers/dma/at_xdmac.c @@ -1394,6 +1394,11 @@ static int at_xdmac_probe(struct platform_device *pdev) dma_cap_set(DMA_CYCLIC, atxdmac->dma.cap_mask); dma_cap_set(DMA_MEMCPY, atxdmac->dma.cap_mask); dma_cap_set(DMA_SLAVE, atxdmac->dma.cap_mask); + /* + * Without DMA_PRIVATE the driver is not able to allocate more than + * one channel, second allocation fails in private_candidate. + */ + dma_cap_set(DMA_PRIVATE, atxdmac->dma.cap_mask); atxdmac->dma.dev = &pdev->dev; atxdmac->dma.device_alloc_chan_resources = at_xdmac_alloc_chan_resources; atxdmac->dma.device_free_chan_resources = at_xdmac_free_chan_resources; |