aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2018-02-15 19:57:05 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2018-03-31 16:12:39 +0200
commit4b486e32fb34567fe8b04aea552225db699813e1 (patch)
treef5ae2ab8d7d4497b30ac522b40098493ad87bad5
parente1fe4a93debcd6e14b0167f21f2329e275f8fb11 (diff)
downloadupstream-4b486e32fb34567fe8b04aea552225db699813e1.tar.gz
upstream-4b486e32fb34567fe8b04aea552225db699813e1.tar.bz2
upstream-4b486e32fb34567fe8b04aea552225db699813e1.zip
mvebu: Add support for WRT3200ACM with new NAND flash
Newer Linksys boards might come with a Winbond W29N02GV which can be configured in different ways. Make sure we configure it the same way as the older chips so everything keeps working. Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
-rw-r--r--target/linux/mvebu/files-4.4/arch/arm/boot/dts/armada-385-linksys-rango.dts2
-rw-r--r--target/linux/mvebu/files-4.9/arch/arm/boot/dts/armada-385-linksys-rango.dts2
-rw-r--r--target/linux/mvebu/patches-4.14/005-linksys_hardcode_nand_ecc_settings.patch17
-rw-r--r--target/linux/mvebu/patches-4.14/220-disable-untested-dsa-boards.patch2
-rw-r--r--target/linux/mvebu/patches-4.14/423-ARM-dts-armada-385-linksys-Disable-internal-RTC.patch2
5 files changed, 23 insertions, 2 deletions
diff --git a/target/linux/mvebu/files-4.4/arch/arm/boot/dts/armada-385-linksys-rango.dts b/target/linux/mvebu/files-4.4/arch/arm/boot/dts/armada-385-linksys-rango.dts
index de1de79da9..ac4ac1b1b1 100644
--- a/target/linux/mvebu/files-4.4/arch/arm/boot/dts/armada-385-linksys-rango.dts
+++ b/target/linux/mvebu/files-4.4/arch/arm/boot/dts/armada-385-linksys-rango.dts
@@ -186,6 +186,8 @@
flash@d0000 {
status = "okay";
num-cs = <1>;
+ nand-ecc-strength = <4>;
+ nand-ecc-step-size = <512>;
marvell,nand-keep-config;
marvell,nand-enable-arbiter;
nand-on-flash-bbt;
diff --git a/target/linux/mvebu/files-4.9/arch/arm/boot/dts/armada-385-linksys-rango.dts b/target/linux/mvebu/files-4.9/arch/arm/boot/dts/armada-385-linksys-rango.dts
index de1de79da9..ac4ac1b1b1 100644
--- a/target/linux/mvebu/files-4.9/arch/arm/boot/dts/armada-385-linksys-rango.dts
+++ b/target/linux/mvebu/files-4.9/arch/arm/boot/dts/armada-385-linksys-rango.dts
@@ -186,6 +186,8 @@
flash@d0000 {
status = "okay";
num-cs = <1>;
+ nand-ecc-strength = <4>;
+ nand-ecc-step-size = <512>;
marvell,nand-keep-config;
marvell,nand-enable-arbiter;
nand-on-flash-bbt;
diff --git a/target/linux/mvebu/patches-4.14/005-linksys_hardcode_nand_ecc_settings.patch b/target/linux/mvebu/patches-4.14/005-linksys_hardcode_nand_ecc_settings.patch
new file mode 100644
index 0000000000..c00e153239
--- /dev/null
+++ b/target/linux/mvebu/patches-4.14/005-linksys_hardcode_nand_ecc_settings.patch
@@ -0,0 +1,17 @@
+Newer Linksys boards might come with a Winbond W29N02GV which can be
+configured in different ways. Make sure we configure it the same way
+as the older chips so everything keeps working.
+
+Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+
+--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
++++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
+@@ -185,6 +185,8 @@
+ /* 128MiB or 256MiB */
+ status = "okay";
+ num-cs = <1>;
++ nand-ecc-strength = <4>;
++ nand-ecc-step-size = <512>;
+ marvell,nand-keep-config;
+ marvell,nand-enable-arbiter;
+ nand-on-flash-bbt;
diff --git a/target/linux/mvebu/patches-4.14/220-disable-untested-dsa-boards.patch b/target/linux/mvebu/patches-4.14/220-disable-untested-dsa-boards.patch
index 8f2275b1ff..5df94bdfad 100644
--- a/target/linux/mvebu/patches-4.14/220-disable-untested-dsa-boards.patch
+++ b/target/linux/mvebu/patches-4.14/220-disable-untested-dsa-boards.patch
@@ -1,6 +1,6 @@
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
-@@ -194,6 +194,7 @@
+@@ -196,6 +196,7 @@
status = "okay";
switch@0 {
diff --git a/target/linux/mvebu/patches-4.14/423-ARM-dts-armada-385-linksys-Disable-internal-RTC.patch b/target/linux/mvebu/patches-4.14/423-ARM-dts-armada-385-linksys-Disable-internal-RTC.patch
index ea5ad5acad..040d6590b5 100644
--- a/target/linux/mvebu/patches-4.14/423-ARM-dts-armada-385-linksys-Disable-internal-RTC.patch
+++ b/target/linux/mvebu/patches-4.14/423-ARM-dts-armada-385-linksys-Disable-internal-RTC.patch
@@ -17,7 +17,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
-@@ -302,3 +302,8 @@
+@@ -304,3 +304,8 @@
status = "okay";
usb-phy = <&usb3_1_phy>;
};