diff options
author | Marek Szyprowski <m.szyprowski@samsung.com> | 2014-02-28 08:42:54 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@linaro.org> | 2014-03-11 13:37:38 -0400 |
commit | bcedb5f9bd74662968fc1b4cb22f24abb4b7723d (patch) | |
tree | 6a3b6640b44c47db27bfceee051cfa879bfb892f | |
parent | f618c4703a14672d27bc2ca5d132a844363d6f5f (diff) |
arm: 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/arm/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mm/init.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e25419817791..d0262bea8020 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -1918,6 +1918,7 @@ config USE_OF | |||
1918 | select IRQ_DOMAIN | 1918 | select IRQ_DOMAIN |
1919 | select OF | 1919 | select OF |
1920 | select OF_EARLY_FLATTREE | 1920 | select OF_EARLY_FLATTREE |
1921 | select OF_RESERVED_MEM | ||
1921 | help | 1922 | help |
1922 | Include support for flattened device tree machine descriptions. | 1923 | Include support for flattened device tree machine descriptions. |
1923 | 1924 | ||
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 804d61566a53..2a77ba8796ae 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
@@ -323,6 +323,8 @@ void __init arm_memblock_init(struct meminfo *mi, | |||
323 | if (mdesc->reserve) | 323 | if (mdesc->reserve) |
324 | mdesc->reserve(); | 324 | mdesc->reserve(); |
325 | 325 | ||
326 | early_init_fdt_scan_reserved_mem(); | ||
327 | |||
326 | /* | 328 | /* |
327 | * reserve memory for DMA contigouos allocations, | 329 | * reserve memory for DMA contigouos allocations, |
328 | * must come from DMA area inside low memory | 330 | * must come from DMA area inside low memory |