diff options
author | Ludovic Desroches <ludovic.desroches@atmel.com> | 2014-11-13 05:52:45 -0500 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2014-11-17 03:37:21 -0500 |
commit | fef4cbf2ab830fcd695d892927386ad9ccc46339 (patch) | |
tree | 0b262524389d8d8a62f14485da8c4774e6589c0f /drivers/dma | |
parent | 466b3cf17ea6bee26cf7a404f51a44f2e884b31e (diff) |
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) | |||
1394 | dma_cap_set(DMA_CYCLIC, atxdmac->dma.cap_mask); | 1394 | dma_cap_set(DMA_CYCLIC, atxdmac->dma.cap_mask); |
1395 | dma_cap_set(DMA_MEMCPY, atxdmac->dma.cap_mask); | 1395 | dma_cap_set(DMA_MEMCPY, atxdmac->dma.cap_mask); |
1396 | dma_cap_set(DMA_SLAVE, atxdmac->dma.cap_mask); | 1396 | dma_cap_set(DMA_SLAVE, atxdmac->dma.cap_mask); |
1397 | /* | ||
1398 | * Without DMA_PRIVATE the driver is not able to allocate more than | ||
1399 | * one channel, second allocation fails in private_candidate. | ||
1400 | */ | ||
1401 | dma_cap_set(DMA_PRIVATE, atxdmac->dma.cap_mask); | ||
1397 | atxdmac->dma.dev = &pdev->dev; | 1402 | atxdmac->dma.dev = &pdev->dev; |
1398 | atxdmac->dma.device_alloc_chan_resources = at_xdmac_alloc_chan_resources; | 1403 | atxdmac->dma.device_alloc_chan_resources = at_xdmac_alloc_chan_resources; |
1399 | atxdmac->dma.device_free_chan_resources = at_xdmac_free_chan_resources; | 1404 | atxdmac->dma.device_free_chan_resources = at_xdmac_free_chan_resources; |