summaryrefslogtreecommitdiffstats
path: root/drivers/dma/pl330.c
diff options
context:
space:
mode:
authorRussell King2013-06-27 11:29:32 +0200
committerRussell King2013-10-31 15:48:41 +0100
commit64113016a456399d3fe4849a4f6593fb1cd48f53 (patch)
treea5378de04f1d7ad280626f07628f292fb4066253 /drivers/dma/pl330.c
parentDMA-API: dma: pl08x: add dma_set_mask_and_coherent() call (diff)
downloadkernel-qcow2-linux-64113016a456399d3fe4849a4f6593fb1cd48f53.tar.gz
kernel-qcow2-linux-64113016a456399d3fe4849a4f6593fb1cd48f53.tar.xz
kernel-qcow2-linux-64113016a456399d3fe4849a4f6593fb1cd48f53.zip
DMA-API: dma: pl330: add dma_set_mask_and_coherent() call
The DMA API requires drivers to call the appropriate dma_set_mask() functions before doing any DMA mapping. Add this required call to the AMBA PL330 driver. Acked-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/dma/pl330.c')
-rw-r--r--drivers/dma/pl330.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index a562d24d20bf..df8b10fd1726 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -2903,6 +2903,10 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
pdat = dev_get_platdata(&adev->dev);
+ ret = dma_set_mask_and_coherent(&adev->dev, DMA_BIT_MASK(32));
+ if (ret)
+ return ret;
+
/* Allocate a new DMAC and its Channels */
pdmac = devm_kzalloc(&adev->dev, sizeof(*pdmac), GFP_KERNEL);
if (!pdmac) {