kernel: update 3.14 to 3.14.18
[openwrt/staging/stintel.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 --- a/arch/arm/Kconfig
17 +++ b/arch/arm/Kconfig
18 @@ -1923,6 +1923,7 @@ config USE_OF
19 select IRQ_DOMAIN
20 select OF
21 select OF_EARLY_FLATTREE
22 + select OF_RESERVED_MEM
23 help
24 Include support for flattened device tree machine descriptions.
25
26 --- a/arch/arm/mm/init.c
27 +++ b/arch/arm/mm/init.c
28 @@ -323,6 +323,8 @@ void __init arm_memblock_init(struct mem
29 if (mdesc->reserve)
30 mdesc->reserve();
31
32 + early_init_fdt_scan_reserved_mem();
33 +
34 /*
35 * reserve memory for DMA contigouos allocations,
36 * must come from DMA area inside low memory