diff options
author | Marek Szyprowski <m.szyprowski@samsung.com> | 2014-02-28 08:42:55 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@linaro.org> | 2014-03-13 06:53:07 -0400 |
commit | 9bf14b7c540ae9ca7747af3a0c0d8470ef77b6ce (patch) | |
tree | 8cf3ae2aff740faef8b33c0f6eb39f93fdd39ac7 | |
parent | bcedb5f9bd74662968fc1b4cb22f24abb4b7723d (diff) |
arm64: 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: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
-rw-r--r-- | arch/arm64/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm64/mm/init.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 27bbcfc7202a..6abf15407dca 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig | |||
@@ -43,6 +43,7 @@ config ARM64 | |||
43 | select NO_BOOTMEM | 43 | select NO_BOOTMEM |
44 | select OF | 44 | select OF |
45 | select OF_EARLY_FLATTREE | 45 | select OF_EARLY_FLATTREE |
46 | select OF_RESERVED_MEM | ||
46 | select PERF_USE_VMALLOC | 47 | select PERF_USE_VMALLOC |
47 | select POWER_RESET | 48 | select POWER_RESET |
48 | select POWER_SUPPLY | 49 | select POWER_SUPPLY |
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index d0b4c2efda90..3fb8d50dfdaa 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c | |||
@@ -160,6 +160,7 @@ void __init arm64_memblock_init(void) | |||
160 | memblock_reserve(base, size); | 160 | memblock_reserve(base, size); |
161 | } | 161 | } |
162 | 162 | ||
163 | early_init_fdt_scan_reserved_mem(); | ||
163 | dma_contiguous_reserve(0); | 164 | dma_contiguous_reserve(0); |
164 | 165 | ||
165 | memblock_allow_resize(); | 166 | memblock_allow_resize(); |