[openwrt/openwrt] mvebu: Add support for WRT3200ACM with new NAND flash

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/4b486e32fb34567fe8b04aea552225db699813e1

commit 4b486e32fb34567fe8b04aea552225db699813e1
Author: Imre Kaloz <kaloz at openwrt.org>
AuthorDate: Thu Feb 15 19:57:05 2018 +0100

    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 at openwrt.org>
---
 .../arch/arm/boot/dts/armada-385-linksys-rango.dts      |  2 ++
 .../arch/arm/boot/dts/armada-385-linksys-rango.dts      |  2 ++
 .../005-linksys_hardcode_nand_ecc_settings.patch        | 17 +++++++++++++++++
 .../patches-4.14/220-disable-untested-dsa-boards.patch  |  2 +-
 ...RM-dts-armada-385-linksys-Disable-internal-RTC.patch |  2 +-
 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 de1de79..ac4ac1b 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 at 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 de1de79..ac4ac1b 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 at 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 0000000..c00e153
--- /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 at 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 8f2275b..5df94bd 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 at 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 ea5ad5a..040d659 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 at 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>;
  };