3af779eb17
This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.11, and Linux v3.12. This work mainly covers: * Ground work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c) between the PXA family,and the Armada family. * Further updates to the mvebu MBus. * Work and ground work for enabling MSI on the Armada family. * some phy / mdio bus initialization related work. * Device tree binding documentation update. Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com> CC: Luka Perkov <luka@openwrt.org> SVN-Revision: 39565
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From 9226a0bb330bb83df9a465ba418efd3277cd00d3 Mon Sep 17 00:00:00 2001
|
|
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Date: Thu, 7 Nov 2013 12:17:34 -0300
|
|
Subject: [PATCH 100/203] ARM: mvebu: Enable NAND controller in Armada XP GP
|
|
board
|
|
|
|
The Armada XP GP board has a NAND flash, so enable it in the devicetree.
|
|
|
|
In order to skip the driver's custom device detection and use only ONFI
|
|
detection, the "marvell,keep-config" parameter is used.
|
|
This is needed because we haven't support for setting the timings
|
|
parameters yet and must rely in bootloader's.
|
|
|
|
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
|
|
---
|
|
arch/arm/boot/dts/armada-xp-gp.dts | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
--- a/arch/arm/boot/dts/armada-xp-gp.dts
|
|
+++ b/arch/arm/boot/dts/armada-xp-gp.dts
|
|
@@ -175,6 +175,14 @@
|
|
spi-max-frequency = <108000000>;
|
|
};
|
|
};
|
|
+
|
|
+ nand@d0000 {
|
|
+ status = "okay";
|
|
+ num-cs = <1>;
|
|
+ marvell,nand-keep-config;
|
|
+ marvell,nand-enable-arbiter;
|
|
+ nand-on-flash-bbt;
|
|
+ };
|
|
};
|
|
};
|
|
};
|