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 21201a0cb3f7c82fd90d3c55c31d24b52ade3354..43068cf44c2d7b20b116281a694e3538124c6812 100644 (file)
--- 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 52806427e15d2cd7ee8cf145cfb132a34b6030ef..81bdd29df3a42c4f71a74759c32d8219d39fdaa3 100644 (file)
--- 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();