summaryrefslogtreecommitdiffstats
path: root/arch/xtensa
diff options
context:
space:
mode:
authorMax Filippov <jcmvbkbc@gmail.com>2016-07-18 23:37:05 +0200
committerMax Filippov <jcmvbkbc@gmail.com>2016-07-24 05:34:00 +0200
commit4e7c84ec045921dacc78d36295e2e61390249665 (patch)
treec3b2473dee4bf875b1a024d5f7e70b0dd3a9113e /arch/xtensa
parentxtensa: drop sysmem and switch to memblock (diff)
downloadlinux-4e7c84ec045921dacc78d36295e2e61390249665.tar.xz
linux-4e7c84ec045921dacc78d36295e2e61390249665.zip
xtensa: support reserved-memory DT node
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>
Diffstat (limited to 'arch/xtensa')
-rw-r--r--arch/xtensa/Kconfig1
-rw-r--r--arch/xtensa/mm/init.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index d20ddf7bf6a9..3f6659c53023 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -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.
diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index 3ee7e29603af..80e4cfb2471a 100644
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c
@@ -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");