]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
dmaengine: at_xdmac: Add DMA_PRIVATE
authorLudovic Desroches <ludovic.desroches@atmel.com>
Thu, 13 Nov 2014 10:52:45 +0000 (11:52 +0100)
committerVinod Koul <vinod.koul@intel.com>
Mon, 17 Nov 2014 08:37:21 +0000 (14:07 +0530)
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>
drivers/dma/at_xdmac.c

index 586275fe11203d5c6742a8e7f75b340c9ff05465..b60d77a22df673c25cf72259ad3be6f7416b19d6 100644 (file)
@@ -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;