From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Fri, 9 Aug 2013 11:01:08 +0000 (+0200)
Subject: ARM: init: add support for reserved memory defined by device tree
X-Git-Tag: MMI-PSA29.97-13-9~13679^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=10bcdfb8ba24760f715f0a700c3812747eddddf5;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

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