]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ARM: 7857/1: dma: imx-sdma: setup dma mask
authorPhilippe Retornaz <philippe.retornaz@epfl.ch>
Mon, 14 Oct 2013 08:45:17 +0000 (09:45 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 14 Oct 2013 15:18:51 +0000 (16:18 +0100)
The dma mask is not configured in the current code.
This was triggered by soc-dmaengine-pcm which allocate the dma
buffers with the imx-sdma as device.
This commit fix audio on imx31.

Signed-off-by: Philippe Rétornaz <philippe.retornaz@epfl.ch>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
drivers/dma/imx-sdma.c

index fc43603cf0bbeca883aa260d880c86898b49e793..c1fd504cae282491969886b0d0336784229e422d 100644 (file)
@@ -1432,6 +1432,10 @@ static int __init sdma_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
+       ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+       if (ret)
+               return ret;
+
        sdma = kzalloc(sizeof(*sdma), GFP_KERNEL);
        if (!sdma)
                return -ENOMEM;