Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: overo: fix gpmc nand on boards with ethernet

The gpmc ranges property for NAND at CS0 was being overridden by later
includes that defined gpmc ethernet nodes, effectively breaking NAND on
these systems:

omap-gpmc 6e000000.gpmc: /ocp/gpmc@6e000000/nand@0,0 has
malformed 'reg' property

Instead of redefining the NAND range in every such dtsi, define all
currently used ranges in omap3-overo-base.dtsi.

Fixes: 98ce6007efb4 ("ARM: dts: overo: Support PoP NAND")
Cc: stable <stable@vger.kernel.org> # 4.3
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

authored by

Johan Hovold and committed by
Tony Lindgren
153b58ea 5e0568df

+3 -8
+3 -1
arch/arm/boot/dts/omap3-overo-base.dtsi
··· 223 223 }; 224 224 225 225 &gpmc { 226 - ranges = <0 0 0x30000000 0x1000000>; /* CS0 */ 226 + ranges = <0 0 0x30000000 0x1000000>, /* CS0 */ 227 + <4 0 0x2b000000 0x1000000>, /* CS4 */ 228 + <5 0 0x2c000000 0x1000000>; /* CS5 */ 227 229 228 230 nand@0,0 { 229 231 compatible = "ti,omap2-nand";
-2
arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi
··· 55 55 #include "omap-gpmc-smsc9221.dtsi" 56 56 57 57 &gpmc { 58 - ranges = <5 0 0x2c000000 0x1000000>; /* CS5 */ 59 - 60 58 ethernet@gpmc { 61 59 reg = <5 0 0xff>; 62 60 interrupt-parent = <&gpio6>;
-2
arch/arm/boot/dts/omap3-overo-tobi-common.dtsi
··· 27 27 #include "omap-gpmc-smsc9221.dtsi" 28 28 29 29 &gpmc { 30 - ranges = <5 0 0x2c000000 0x1000000>; /* CS5 */ 31 - 32 30 ethernet@gpmc { 33 31 reg = <5 0 0xff>; 34 32 interrupt-parent = <&gpio6>;
-3
arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi
··· 15 15 #include "omap-gpmc-smsc9221.dtsi" 16 16 17 17 &gpmc { 18 - ranges = <4 0 0x2b000000 0x1000000>, /* CS4 */ 19 - <5 0 0x2c000000 0x1000000>; /* CS5 */ 20 - 21 18 smsc1: ethernet@gpmc { 22 19 reg = <5 0 0xff>; 23 20 interrupt-parent = <&gpio6>;