diff options
author | Alexey Brodkin <Alexey.Brodkin@synopsys.com> | 2016-04-26 12:29:34 -0400 |
---|---|---|
committer | Vineet Gupta <vgupta@synopsys.com> | 2016-04-27 07:36:56 -0400 |
commit | 1b10cb21d888c021bedbe678f7c26aee1bf04ffa (patch) | |
tree | 369fa1ab7e038c4c2c768eca83e0316d7c595125 /arch | |
parent | 32ed9a0e0ddcf58ef343bcb6ae44ee60d1ee31ce (diff) |
ARC: add support for reserved memory defined by device tree
Enable reserved memory initialization from device tree.
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arc/Kconfig | 1 | ||||
-rw-r--r-- | arch/arc/mm/init.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index 28d47f8eb934..ec4791ea6911 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig | |||
@@ -35,6 +35,7 @@ config ARC | |||
35 | select NO_BOOTMEM | 35 | select NO_BOOTMEM |
36 | select OF | 36 | select OF |
37 | select OF_EARLY_FLATTREE | 37 | select OF_EARLY_FLATTREE |
38 | select OF_RESERVED_MEM | ||
38 | select PERF_USE_VMALLOC | 39 | select PERF_USE_VMALLOC |
39 | select HAVE_DEBUG_STACKOVERFLOW | 40 | select HAVE_DEBUG_STACKOVERFLOW |
40 | select HAVE_GENERIC_DMA_COHERENT | 41 | select HAVE_GENERIC_DMA_COHERENT |
diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c index 7d2c4fbf4f22..5487d0b97400 100644 --- a/arch/arc/mm/init.c +++ b/arch/arc/mm/init.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #ifdef CONFIG_BLK_DEV_INITRD | 13 | #ifdef CONFIG_BLK_DEV_INITRD |
14 | #include <linux/initrd.h> | 14 | #include <linux/initrd.h> |
15 | #endif | 15 | #endif |
16 | #include <linux/of_fdt.h> | ||
16 | #include <linux/swap.h> | 17 | #include <linux/swap.h> |
17 | #include <linux/module.h> | 18 | #include <linux/module.h> |
18 | #include <linux/highmem.h> | 19 | #include <linux/highmem.h> |
@@ -136,6 +137,9 @@ void __init setup_arch_memory(void) | |||
136 | memblock_reserve(__pa(initrd_start), initrd_end - initrd_start); | 137 | memblock_reserve(__pa(initrd_start), initrd_end - initrd_start); |
137 | #endif | 138 | #endif |
138 | 139 | ||
140 | early_init_fdt_reserve_self(); | ||
141 | early_init_fdt_scan_reserved_mem(); | ||
142 | |||
139 | memblock_dump_all(); | 143 | memblock_dump_all(); |
140 | 144 | ||
141 | /*----------------- node/zones setup --------------------------*/ | 145 | /*----------------- node/zones setup --------------------------*/ |