diff options
author | Marek Szyprowski <m.szyprowski@samsung.com> | 2013-08-09 07:01:08 -0400 |
---|---|---|
committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2013-08-27 04:53:45 -0400 |
commit | 10bcdfb8ba24760f715f0a700c3812747eddddf5 (patch) | |
tree | f5f9c20eea2993955b875dedbe14e0a6e2ab623d /arch/arm/mm | |
parent | 9d8eab7af79cb4ce2de5de39f82c455b1f796963 (diff) |
ARM: init: 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>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Acked-by: Tomasz Figa <t.figa@samsung.com>
Diffstat (limited to 'arch/arm/mm')
-rw-r--r-- | arch/arm/mm/init.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 15225d829d71..6a2fe4453eee 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/nodemask.h> | 17 | #include <linux/nodemask.h> |
18 | #include <linux/initrd.h> | 18 | #include <linux/initrd.h> |
19 | #include <linux/of_fdt.h> | 19 | #include <linux/of_fdt.h> |
20 | #include <linux/of_reserved_mem.h> | ||
20 | #include <linux/highmem.h> | 21 | #include <linux/highmem.h> |
21 | #include <linux/gfp.h> | 22 | #include <linux/gfp.h> |
22 | #include <linux/memblock.h> | 23 | #include <linux/memblock.h> |
@@ -377,6 +378,8 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc) | |||
377 | if (mdesc->reserve) | 378 | if (mdesc->reserve) |
378 | mdesc->reserve(); | 379 | mdesc->reserve(); |
379 | 380 | ||
381 | early_init_dt_scan_reserved_mem(); | ||
382 | |||
380 | /* | 383 | /* |
381 | * reserve memory for DMA contigouos allocations, | 384 | * reserve memory for DMA contigouos allocations, |
382 | * must come from DMA area inside low memory | 385 | * must come from DMA area inside low memory |