mvebu: backport mainline patches from kernel 3.12
[openwrt.git] / target / linux / mvebu / patches-3.10 / 0100-ARM-mvebu-Enable-NAND-controller-in-Armada-XP-GP-boa.patch
1 From 9226a0bb330bb83df9a465ba418efd3277cd00d3 Mon Sep 17 00:00:00 2001
2 From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
3 Date: Thu, 7 Nov 2013 12:17:34 -0300
4 Subject: [PATCH 100/203] ARM: mvebu: Enable NAND controller in Armada XP GP
5  board
6
7 The Armada XP GP board has a NAND flash, so enable it in the devicetree.
8
9 In order to skip the driver's custom device detection and use only ONFI
10 detection, the "marvell,keep-config" parameter is used.
11 This is needed because we haven't support for setting the timings
12 parameters yet and must rely in bootloader's.
13
14 Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
15 Signed-off-by: Jason Cooper <jason@lakedaemon.net>
16 ---
17  arch/arm/boot/dts/armada-xp-gp.dts | 8 ++++++++
18  1 file changed, 8 insertions(+)
19
20 --- a/arch/arm/boot/dts/armada-xp-gp.dts
21 +++ b/arch/arm/boot/dts/armada-xp-gp.dts
22 @@ -175,6 +175,14 @@
23                                         spi-max-frequency = <108000000>;
24                                 };
25                         };
26 +
27 +                       nand@d0000 {
28 +                               status = "okay";
29 +                               num-cs = <1>;
30 +                               marvell,nand-keep-config;
31 +                               marvell,nand-enable-arbiter;
32 +                               nand-on-flash-bbt;
33 +                       };
34                 };
35         };
36  };