aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2014-02-28 08:42:56 -0500
committerGrant Likely <grant.likely@linaro.org>2014-03-13 06:53:23 -0400
commit708b7eef12f945a510ba5ac3b4007d7ae4796d55 (patch)
tree6f0eb44131a073a4b6bdb5e60cd8e13660506870
parent9bf14b7c540ae9ca7747af3a0c0d8470ef77b6ce (diff)
powerpc: 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>
-rw-r--r--arch/powerpc/Kconfig1
-rw-r--r--arch/powerpc/kernel/prom.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 957bf344c0f5..3b6617fed8fc 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -90,6 +90,7 @@ config PPC
90 select BINFMT_ELF 90 select BINFMT_ELF
91 select OF 91 select OF
92 select OF_EARLY_FLATTREE 92 select OF_EARLY_FLATTREE
93 select OF_RESERVED_MEM
93 select HAVE_FTRACE_MCOUNT_RECORD 94 select HAVE_FTRACE_MCOUNT_RECORD
94 select HAVE_DYNAMIC_FTRACE 95 select HAVE_DYNAMIC_FTRACE
95 select HAVE_FUNCTION_TRACER 96 select HAVE_FUNCTION_TRACER
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index f58c0d3aaeb4..591986215801 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -33,6 +33,7 @@
33#include <linux/irq.h> 33#include <linux/irq.h>
34#include <linux/memblock.h> 34#include <linux/memblock.h>
35#include <linux/of.h> 35#include <linux/of.h>
36#include <linux/of_fdt.h>
36 37
37#include <asm/prom.h> 38#include <asm/prom.h>
38#include <asm/rtas.h> 39#include <asm/rtas.h>
@@ -588,6 +589,8 @@ static void __init early_reserve_mem_dt(void)
588 memblock_reserve(base, size); 589 memblock_reserve(base, size);
589 } 590 }
590 } 591 }
592
593 early_init_fdt_scan_reserved_mem();
591} 594}
592 595
593static void __init early_reserve_mem(void) 596static void __init early_reserve_mem(void)