From 4e7c84ec045921dacc78d36295e2e61390249665 Mon Sep 17 00:00:00 2001
From: Max Filippov <jcmvbkbc@gmail.com>
Date: Tue, 19 Jul 2016 00:37:05 +0300
Subject: 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>
---
 arch/xtensa/Kconfig   | 1 +
 arch/xtensa/mm/init.c | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'arch/xtensa')

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");
-- 
cgit v1.2.3-58-ga151