aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-06-27 05:29:32 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-10-31 10:48:42 -0400
commite0a8ba2581ba832adac729d9ba48ee8561d65dc0 (patch)
tree1fce8cd48c531b601884e5528109a0bf93cd6e46
parent64113016a456399d3fe4849a4f6593fb1cd48f53 (diff)
DMA-API: video: clcd: 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. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/video/amba-clcd.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
index 0a2cce7285be..afe4702a5528 100644
--- a/drivers/video/amba-clcd.c
+++ b/drivers/video/amba-clcd.c
@@ -10,6 +10,7 @@
10 * 10 *
11 * ARM PrimeCell PL110 Color LCD Controller 11 * ARM PrimeCell PL110 Color LCD Controller
12 */ 12 */
13#include <linux/dma-mapping.h>
13#include <linux/module.h> 14#include <linux/module.h>
14#include <linux/kernel.h> 15#include <linux/kernel.h>
15#include <linux/errno.h> 16#include <linux/errno.h>
@@ -551,6 +552,10 @@ static int clcdfb_probe(struct amba_device *dev, const struct amba_id *id)
551 if (!board) 552 if (!board)
552 return -EINVAL; 553 return -EINVAL;
553 554
555 ret = dma_set_mask_and_coherent(&dev->dev, DMA_BIT_MASK(32));
556 if (ret)
557 goto out;
558
554 ret = amba_request_regions(dev, NULL); 559 ret = amba_request_regions(dev, NULL);
555 if (ret) { 560 if (ret) {
556 printk(KERN_ERR "CLCD: unable to reserve regs region\n"); 561 printk(KERN_ERR "CLCD: unable to reserve regs region\n");