From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Fri, 28 Feb 2014 13:42:55 +0000 (+0100)
Subject: arm64: add support for reserved memory defined by device tree
X-Git-Tag: firefly_0821_release~3680^2~36^2~24^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=91e8ffa66ead9f85ff86bdcb03042ada441acf78;p=firefly-linux-kernel-4.4.55.git

arm64: 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: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
(cherry picked from commit 9bf14b7c540ae9ca7747af3a0c0d8470ef77b6ce)
Signed-off-by: Mark Brown <broonie@kernel.org>
---

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 21201a0cb3f7..43068cf44c2d 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -41,6 +41,7 @@ config ARM64
 	select NO_BOOTMEM
 	select OF
 	select OF_EARLY_FLATTREE
+	select OF_RESERVED_MEM
 	select PERF_USE_VMALLOC
 	select POWER_RESET
 	select POWER_SUPPLY
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 52806427e15d..81bdd29df3a4 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -170,6 +170,7 @@ void __init arm64_memblock_init(void)
 		memblock_reserve(base, size);
 	}
 
+	early_init_fdt_scan_reserved_mem();
 	dma_contiguous_reserve(0);
 
 	memblock_allow_resize();