8ff56329e0bd588746afa566fde50e1ab02a1047
[15.05/openwrt.git] / target / linux / ipq806x / patches / 0052-arm-add-support-for-reserved-memory-defined-by-devic.patch
1 From 95c831bca9181df62230171fd66286d08ea886a8 Mon Sep 17 00:00:00 2001
2 From: Marek Szyprowski <m.szyprowski@samsung.com>
3 Date: Fri, 28 Feb 2014 14:42:54 +0100
4 Subject: [PATCH 052/182] arm: add support for reserved memory defined by
5  device tree
6
7 Enable reserved memory initialization from device tree.
8
9 Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
10 Signed-off-by: Grant Likely <grant.likely@linaro.org>
11 ---
12  arch/arm/Kconfig   |    1 +
13  arch/arm/mm/init.c |    2 ++
14  2 files changed, 3 insertions(+)
15
16 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
17 index d02ce70..4332e8d 100644
18 --- a/arch/arm/Kconfig
19 +++ b/arch/arm/Kconfig
20 @@ -1922,6 +1922,7 @@ config USE_OF
21         select IRQ_DOMAIN
22         select OF
23         select OF_EARLY_FLATTREE
24 +       select OF_RESERVED_MEM
25         help
26           Include support for flattened device tree machine descriptions.
27  
28 diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
29 index 804d615..2a77ba8 100644
30 --- a/arch/arm/mm/init.c
31 +++ b/arch/arm/mm/init.c
32 @@ -323,6 +323,8 @@ void __init arm_memblock_init(struct meminfo *mi,
33         if (mdesc->reserve)
34                 mdesc->reserve();
35  
36 +       early_init_fdt_scan_reserved_mem();
37 +
38         /*
39          * reserve memory for DMA contigouos allocations,
40          * must come from DMA area inside low memory
41 -- 
42 1.7.10.4
43