66e35c5246
In order for the image to be built, some patches need to be ported to 3.19. Add the relevant patches. Note that most of them (if not all) should be merged in 3.20, removing the need to carry them on then. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 44267
40 lines
1.0 KiB
Diff
40 lines
1.0 KiB
Diff
From 7eb1f09ec8e25aa2fc3f6fc5fc9405d9f917d503 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
Date: Thu, 11 Dec 2014 14:14:58 +0100
|
|
Subject: [PATCH 1/2] ARM: mvebu: A385-AP: Enable the NAND controller
|
|
|
|
The A385 AP has a 1GB NAND chip. Enable it.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
---
|
|
arch/arm/boot/dts/armada-385-db-ap.dts | 13 +++++++++++++
|
|
1 file changed, 13 insertions(+)
|
|
|
|
diff --git a/arch/arm/boot/dts/armada-385-db-ap.dts b/arch/arm/boot/dts/armada-385-db-ap.dts
|
|
index 3a51531eb37b..02db04867d8f 100644
|
|
--- a/arch/arm/boot/dts/armada-385-db-ap.dts
|
|
+++ b/arch/arm/boot/dts/armada-385-db-ap.dts
|
|
@@ -122,6 +122,19 @@
|
|
phy = <&phy0>;
|
|
phy-mode = "rgmii-id";
|
|
};
|
|
+
|
|
+ nfc: flash@d0000 {
|
|
+ status = "okay";
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <1>;
|
|
+
|
|
+ num-cs = <1>;
|
|
+ nand-ecc-strength = <4>;
|
|
+ nand-ecc-step-size = <512>;
|
|
+ marvell,nand-keep-config;
|
|
+ marvell,nand-enable-arbiter;
|
|
+ nand-on-flash-bbt;
|
|
+ };
|
|
};
|
|
|
|
pcie-controller {
|
|
--
|
|
2.2.1
|
|
|