aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-exynos/mach-midas.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-exynos/mach-midas.c')
-rw-r--r--arch/arm/mach-exynos/mach-midas.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/mach-midas.c b/arch/arm/mach-exynos/mach-midas.c
index fc6c224..ddc2d14 100644
--- a/arch/arm/mach-exynos/mach-midas.c
+++ b/arch/arm/mach-exynos/mach-midas.c
@@ -58,6 +58,7 @@
#ifdef CONFIG_DMA_CMA
#include <linux/dma-contiguous.h>
+#include <linux/exynos_mem.h>
#endif
#include <asm/mach/arch.h>
@@ -3423,11 +3424,14 @@ static void __init exynos4_reserve(void)
CONFIG_VIDEO_SAMSUNG_MEMSIZE_FIMC1 * SZ_1K, 0x65800000, 0);
if (ret != 0)
panic("alloc failed for FIMC1\n");
+ cma_region_descriptor_add(s3c_device_fimc1.name, 0x65800000,
+ CONFIG_VIDEO_SAMSUNG_MEMSIZE_FIMC1 * SZ_1K);
#endif
#if defined(CONFIG_USE_MFC_CMA) && defined(CONFIG_MACH_M0)
ret = dma_declare_contiguous(&s5p_device_mfc.dev,
0x02800000, 0x5C800000, 0);
+ cma_region_descriptor_add(s5p_device_mfc.name, 0x5C800000, 0x02800000);
#endif
if (ret != 0)
printk(KERN_ERR "%s Fail\n", __func__);