diff options
author | Olof Johansson <olof@lixom.net> | 2014-09-23 22:29:09 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-09-23 22:29:09 -0700 |
commit | 422d9abf99f12de5eb5fbc0f5bce87ff1066f941 (patch) | |
tree | 54104d472fddc72f0f0f43a4afac5d2c9036b400 /arch/arm/boot/dts/armada-370-netgear-rn102.dts | |
parent | 2fee8c1dd07260329e9788984b79b099456a9d11 (diff) | |
parent | ace8578182dc347b043c0825b9873f62fdaa5b77 (diff) | |
download | op-kernel-dev-422d9abf99f12de5eb5fbc0f5bce87ff1066f941.zip op-kernel-dev-422d9abf99f12de5eb5fbc0f5bce87ff1066f941.tar.gz |
Merge tag 'mvebu-fixes-3.17' of git://git.infradead.org/linux-mvebu into next/fixes-non-critical
Merge "mvebu fixes for v3.17" from Jason Cooper:
- kirkwood
- final driver cleanup of ARCH_KIRKWOOD removal
- fix DT based DSA
- mvebu
- use BCH ECC for the RN2120 and RN104/2 nand chips
* tag 'mvebu-fixes-3.17' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: Netgear RN102: Use Hardware BCH ECC
ARM: Kirkwood: Fix DT based DSA.
ARM: mvebu: Netgear RN2120: Use Hardware BCH ECC
ARM: mvebu: Netgear RN104: Use Hardware BCH ECC
cpufreq: Remove ARCH_KIRKWOOD dependency
watchdog: Remove ARCH_KIRKWOOD dependency
rtc: Remove ARCH_KIRKWOOD dependency
leds: Remove ARCH_KIRKWOOD dependency
thermal: Remove ARCH_KIRKWOOD dependency
ata: Remove ARCH_KIRKWOOD dependency
cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency
Diffstat (limited to 'arch/arm/boot/dts/armada-370-netgear-rn102.dts')
-rw-r--r-- | arch/arm/boot/dts/armada-370-netgear-rn102.dts | 4 |
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 d6d572e..285524f 100644 --- a/arch/arm/boot/dts/armada-370-netgear-rn102.dts +++ b/arch/arm/boot/dts/armada-370-netgear-rn102.dts @@ -143,6 +143,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 */ |