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>

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 de1de79da9b2018f330b99ca11c86a5486f7a16c..ac4ac1b1b1a17df01cf8aac4c53c66c3ed3d0976 100644 (file)
--- 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 de1de79da9b2018f330b99ca11c86a5486f7a16c..ac4ac1b1b1a17df01cf8aac4c53c66c3ed3d0976 100644 (file)
--- 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 (file)
index 0000000..c5cec0c
--- /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
+@@ -174,6 +174,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;