summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-06-27 10:29:32 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-10-31 14:48:39 +0000
commitde1a2419592d488a8e80bcc396c2be8ce06b71c3 (patch)
treec05eb0d2f6a9be6f2b5335b2d1ab7e9afcc8b1d4 /drivers/dma
parent446b2a9380b64b9d7410d86ee8226031e03645cf (diff)
downloadop-kernel-dev-de1a2419592d488a8e80bcc396c2be8ce06b71c3.zip
op-kernel-dev-de1a2419592d488a8e80bcc396c2be8ce06b71c3.tar.gz
DMA-API: dma: pl08x: 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 PL08x 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')
-rw-r--r--drivers/dma/amba-pl08x.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index fce46c5..e51a983 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -2055,6 +2055,11 @@ static int pl08x_probe(struct amba_device *adev, const struct amba_id *id)
if (ret)
return ret;
+ /* Ensure that we can do DMA */
+ ret = dma_set_mask_and_coherent(&adev->dev, DMA_BIT_MASK(32));
+ if (ret)
+ goto out_no_pl08x;
+
/* Create the driver state holder */
pl08x = kzalloc(sizeof(*pl08x), GFP_KERNEL);
if (!pl08x) {
OpenPOWER on IntegriCloud