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: 98ce6007ef
("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>
This commit is contained in:
parent
5e0568dfbf
commit
153b58ea93
|
@ -223,7 +223,9 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
&gpmc {
|
&gpmc {
|
||||||
ranges = <0 0 0x30000000 0x1000000>; /* CS0 */
|
ranges = <0 0 0x30000000 0x1000000>, /* CS0 */
|
||||||
|
<4 0 0x2b000000 0x1000000>, /* CS4 */
|
||||||
|
<5 0 0x2c000000 0x1000000>; /* CS5 */
|
||||||
|
|
||||||
nand@0,0 {
|
nand@0,0 {
|
||||||
compatible = "ti,omap2-nand";
|
compatible = "ti,omap2-nand";
|
||||||
|
|
|
@ -55,8 +55,6 @@
|
||||||
#include "omap-gpmc-smsc9221.dtsi"
|
#include "omap-gpmc-smsc9221.dtsi"
|
||||||
|
|
||||||
&gpmc {
|
&gpmc {
|
||||||
ranges = <5 0 0x2c000000 0x1000000>; /* CS5 */
|
|
||||||
|
|
||||||
ethernet@gpmc {
|
ethernet@gpmc {
|
||||||
reg = <5 0 0xff>;
|
reg = <5 0 0xff>;
|
||||||
interrupt-parent = <&gpio6>;
|
interrupt-parent = <&gpio6>;
|
||||||
|
|
|
@ -27,8 +27,6 @@
|
||||||
#include "omap-gpmc-smsc9221.dtsi"
|
#include "omap-gpmc-smsc9221.dtsi"
|
||||||
|
|
||||||
&gpmc {
|
&gpmc {
|
||||||
ranges = <5 0 0x2c000000 0x1000000>; /* CS5 */
|
|
||||||
|
|
||||||
ethernet@gpmc {
|
ethernet@gpmc {
|
||||||
reg = <5 0 0xff>;
|
reg = <5 0 0xff>;
|
||||||
interrupt-parent = <&gpio6>;
|
interrupt-parent = <&gpio6>;
|
||||||
|
|
|
@ -15,9 +15,6 @@
|
||||||
#include "omap-gpmc-smsc9221.dtsi"
|
#include "omap-gpmc-smsc9221.dtsi"
|
||||||
|
|
||||||
&gpmc {
|
&gpmc {
|
||||||
ranges = <4 0 0x2b000000 0x1000000>, /* CS4 */
|
|
||||||
<5 0 0x2c000000 0x1000000>; /* CS5 */
|
|
||||||
|
|
||||||
smsc1: ethernet@gpmc {
|
smsc1: ethernet@gpmc {
|
||||||
reg = <5 0 0xff>;
|
reg = <5 0 0xff>;
|
||||||
interrupt-parent = <&gpio6>;
|
interrupt-parent = <&gpio6>;
|
||||||
|
|
Loading…
Reference in a new issue