summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2019-07-30 03:17:59 -0300
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-08-12 13:17:39 -0300
commit0bf63e2c2913391dbf7e49ed8df2c89c180e58d9 (patch)
tree5b9c004f92130fdd1b4466b1f27c54d77a69c3be
parent97299a3035328d7ae2f4fccaf6e549974df6e118 (diff)
downloadlinux-0bf63e2c2913391dbf7e49ed8df2c89c180e58d9.tar.bz2
media: mach-omap2/devices.c: set dma mask
The dma_mask and coherent_dma_mask values were never set. This prevented the media omap_vout driver from loading successfully. Tested on a Pandaboard and Beagle XM board. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rw-r--r--arch/arm/mach-omap2/devices.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index cc0d08dad141..5a2e198e7db1 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -10,6 +10,7 @@
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/clk.h>
+#include <linux/dma-mapping.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/of.h>
@@ -43,11 +44,17 @@ static struct resource omap_vout_resource[2] = {
};
#endif
+static u64 omap_vout_dma_mask = DMA_BIT_MASK(32);
+
static struct platform_device omap_vout_device = {
.name = "omap_vout",
.num_resources = ARRAY_SIZE(omap_vout_resource),
.resource = &omap_vout_resource[0],
.id = -1,
+ .dev = {
+ .dma_mask = &omap_vout_dma_mask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
+ },
};
int __init omap_init_vout(void)