]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
xtensa: support reserved-memory DT node
authorMax Filippov <jcmvbkbc@gmail.com>
Mon, 18 Jul 2016 21:37:05 +0000 (00:37 +0300)
committerMax Filippov <jcmvbkbc@gmail.com>
Sun, 24 Jul 2016 03:34:00 +0000 (06:34 +0300)
This allows reserving regions of physical memory from the device tree.
See Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt
for more details.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
arch/xtensa/Kconfig
arch/xtensa/mm/init.c

index d20ddf7bf6a920b4d15295b93f3dbd8ac96ec0b7..3f6659c530233c7164c120892fee8aa2affb9d12 100644 (file)
@@ -435,6 +435,7 @@ config USE_OF
        bool "Flattened Device Tree support"
        select OF
        select OF_EARLY_FLATTREE
+       select OF_RESERVED_MEM
        help
          Include support for flattened device tree machine descriptions.
 
index 3ee7e29603af876e12b47328439d47e882cea7d7..80e4cfb2471ad5af6a99433d6e8af76e16865558 100644 (file)
@@ -25,6 +25,7 @@
 #include <linux/mman.h>
 #include <linux/nodemask.h>
 #include <linux/mm.h>
+#include <linux/of_fdt.h>
 
 #include <asm/bootparam.h>
 #include <asm/page.h>
@@ -48,6 +49,7 @@ void __init bootmem_init(void)
        else
                memblock_reserve(0, 1);
 
+       early_init_fdt_scan_reserved_mem();
 
        if (!memblock_phys_mem_size())
                panic("No memory found!\n");