aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSergio Aguirre <saaguirre@ti.com>2011-12-16 12:58:46 +0800
committerAndy Green <andy.green@linaro.org>2011-12-26 22:32:41 +0800
commit79a31f99f59a7e8ff00fe7913704ffd4d32eb512 (patch)
treebfeed8851c8ff7e81c97d942c9c92a35e8ebd56e /arch
parente73cef1a1a5b04cefdc2c20a4f7947e47de00549 (diff)
arm: Add support for CMA for omap4iss driver
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/devices.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 0a3affeb9c6..fdd35388e76 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -17,6 +17,9 @@
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/of.h>
+#ifdef CONFIG_CMA
+#include <linux/dma-contiguous.h>
+#endif
#include <mach/hardware.h>
#include <mach/irqs.h>
@@ -250,6 +253,11 @@ int omap4_init_camera(struct iss_platform_data *pdata, struct omap_board_data *b
oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt);
+#ifdef CONFIG_CMA
+ /* Create private 32MiB contiguous memory area for omap4iss device */
+ dma_declare_contiguous(&pdev->dev, 32*SZ_1M, 0, 0);
+#endif
+
return 0;
}