summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/init.c
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2013-08-09 13:01:08 +0200
committerMarek Szyprowski <m.szyprowski@samsung.com>2013-08-27 10:53:45 +0200
commit10bcdfb8ba24760f715f0a700c3812747eddddf5 (patch)
treef5f9c20eea2993955b875dedbe14e0a6e2ab623d /arch/arm/mm/init.c
parentdrivers: of: add initialization code for dma reserved memory (diff)
downloadlinux-10bcdfb8ba24760f715f0a700c3812747eddddf5.tar.xz
linux-10bcdfb8ba24760f715f0a700c3812747eddddf5.zip
ARM: init: add support for reserved memory defined by device tree
Enable reserved memory initialization from device tree. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Michal Nazarewicz <mina86@mina86.com> Acked-by: Tomasz Figa <t.figa@samsung.com>
Diffstat (limited to 'arch/arm/mm/init.c')
-rw-r--r--arch/arm/mm/init.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 15225d829d71..6a2fe4453eee 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -17,6 +17,7 @@
#include <linux/nodemask.h>
#include <linux/initrd.h>
#include <linux/of_fdt.h>
+#include <linux/of_reserved_mem.h>
#include <linux/highmem.h>
#include <linux/gfp.h>
#include <linux/memblock.h>
@@ -377,6 +378,8 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc)
if (mdesc->reserve)
mdesc->reserve();
+ early_init_dt_scan_reserved_mem();
+
/*
* reserve memory for DMA contigouos allocations,
* must come from DMA area inside low memory