summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorklightspeed@killerwolves.net <klightspeed@killerwolves.net>2014-09-10 18:55:41 +1000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-10-30 09:38:25 -0700
commitc238c3434129b28de67d01c22b7456b2dd138759 (patch)
treea0ba2001ec92d100036366a87b6a002ae713c149
parent55c5fc46be38debf2045c38c23f5084d09f21919 (diff)
downloadlinux-stable-c238c3434129b28de67d01c22b7456b2dd138759.tar.gz
linux-stable-c238c3434129b28de67d01c22b7456b2dd138759.tar.bz2
linux-stable-c238c3434129b28de67d01c22b7456b2dd138759.zip
ARM: mvebu: Netgear RN102: Use Hardware BCH ECC
commit ace8578182dc347b043c0825b9873f62fdaa5b77 upstream. The bootloader on the Netgear ReadyNAS RN102 uses Hardware BCH ECC (strength = 4), while the pxa3xx NAND driver by default uses Hamming ECC (strength = 1). This patch changes the ECC mode on these machines to match that of the bootloader and of the stock firmware. That way, it is now possible to update the kernel from userland (e.g. using standard tools from mtd-utils package); u-boot will happily load and boot it. Fixes: 92beaccd8b49 ("ARM: mvebu: Enable NAND controller in ReadyNAS 102 .dts file") Signed-off-by: Ben Peddell <klightspeed@killerwolves.net> Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Tested-by: Arnaud Ebalard <arno@natisbad.org> Link: https://lkml.kernel.org/r/1410339341-3372-1-git-send-email-klightspeed@killerwolves.net Signed-off-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm/boot/dts/armada-370-netgear-rn102.dts4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-370-netgear-rn102.dts b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
index 651aeb5ef439..f3188e953de4 100644
--- a/arch/arm/boot/dts/armada-370-netgear-rn102.dts
+++ b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
@@ -144,6 +144,10 @@
marvell,nand-enable-arbiter;
nand-on-flash-bbt;
+ /* Use Hardware BCH ECC */
+ nand-ecc-strength = <4>;
+ nand-ecc-step-size = <512>;
+
partition@0 {
label = "u-boot";
reg = <0x0000000 0x180000>; /* 1.5MB */