arm: 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>
Signed-off-by: Grant Likely <grant.likely@linaro.org>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e254198177914ca13050f37519a6ca43e0da596d..d0262bea8020c2f4d1f99fc700fae659c76314ec 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1918,6 +1918,7 @@ config USE_OF
        select IRQ_DOMAIN
        select OF
        select OF_EARLY_FLATTREE
+       select OF_RESERVED_MEM
        help
          Include support for flattened device tree machine descriptions.
 

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 804d61566a53dd235750f44ed6ad7875df246b70..2a77ba8796aeed0d6f6bf0e769422d557196ddba 100644 (file)
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -323,6 +323,8 @@ void __init arm_memblock_init(struct meminfo *mi,
        if (mdesc->reserve)
                mdesc->reserve();
 
+       early_init_fdt_scan_reserved_mem();
+
        /*
         * reserve memory for DMA contigouos allocations,
         * must come from DMA area inside low memory