[PATCH 4.7 105/184] ARM: dts: overo: fix gpmc nand on boards with ethernet

[Greg Kroah-Hartman]

4.7-stable review patch.  If anyone has any objections, please let me know.

--

From: Johan Hovold 

commit 153b58ea932b2d0642fa5cd41c93bb0555f3f09b upstream.

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 6e00.gpmc: /ocp/gpmc@6e00/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")
Signed-off-by: Johan Hovold 
Signed-off-by: Tony Lindgren 
Signed-off-by: Greg Kroah-Hartman 

---
 arch/arm/boot/dts/omap3-overo-base.dtsi  |4 +++-
 arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi |2 --
 arch/arm/boot/dts/omap3-overo-tobi-common.dtsi   |2 --
 arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi|3 ---
 4 files changed, 3 insertions(+), 8 deletions(-)

--- a/arch/arm/boot/dts/omap3-overo-base.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-base.dtsi
@@ -223,7 +223,9 @@
 };
 
  {
-   ranges = <0 0 0x3000 0x100>;/* CS0 */
+   ranges = <0 0 0x3000 0x100>,/* CS0 */
+<4 0 0x2b00 0x100>,/* CS4 */
+<5 0 0x2c00 0x100>;/* CS5 */
 
nand@0,0 {
compatible = "ti,omap2-nand";
--- a/arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi
@@ -55,8 +55,6 @@
 #include "omap-gpmc-smsc9221.dtsi"
 
  {
-   ranges = <5 0 0x2c00 0x100>;/* CS5 */
-
ethernet@gpmc {
reg = <5 0 0xff>;
interrupt-parent = <>;
--- a/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi
@@ -27,8 +27,6 @@
 #include "omap-gpmc-smsc9221.dtsi"
 
  {
-   ranges = <5 0 0x2c00 0x100>;/* CS5 */
-
ethernet@gpmc {
reg = <5 0 0xff>;
interrupt-parent = <>;
--- a/arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi
@@ -15,9 +15,6 @@
 #include "omap-gpmc-smsc9221.dtsi"
 
  {
-   ranges = <4 0 0x2b00 0x100>,/* CS4 */
-<5 0 0x2c00 0x100>;/* CS5 */
-
smsc1: ethernet@gpmc {
reg = <5 0 0xff>;
interrupt-parent = <>;

[PATCH 4.7 105/184] ARM: dts: overo: fix gpmc nand on boards with ethernet

[Greg Kroah-Hartman]

4.7-stable review patch.  If anyone has any objections, please let me know.

--

From: Johan Hovold 

commit 153b58ea932b2d0642fa5cd41c93bb0555f3f09b upstream.

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 6e00.gpmc: /ocp/gpmc@6e00/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")
Signed-off-by: Johan Hovold 
Signed-off-by: Tony Lindgren 
Signed-off-by: Greg Kroah-Hartman 

---
 arch/arm/boot/dts/omap3-overo-base.dtsi  |4 +++-
 arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi |2 --
 arch/arm/boot/dts/omap3-overo-tobi-common.dtsi   |2 --
 arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi|3 ---
 4 files changed, 3 insertions(+), 8 deletions(-)

--- a/arch/arm/boot/dts/omap3-overo-base.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-base.dtsi
@@ -223,7 +223,9 @@
 };
 
  {
-   ranges = <0 0 0x3000 0x100>;/* CS0 */
+   ranges = <0 0 0x3000 0x100>,/* CS0 */
+<4 0 0x2b00 0x100>,/* CS4 */
+<5 0 0x2c00 0x100>;/* CS5 */
 
nand@0,0 {
compatible = "ti,omap2-nand";
--- a/arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi
@@ -55,8 +55,6 @@
 #include "omap-gpmc-smsc9221.dtsi"
 
  {
-   ranges = <5 0 0x2c00 0x100>;/* CS5 */
-
ethernet@gpmc {
reg = <5 0 0xff>;
interrupt-parent = <>;
--- a/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi
@@ -27,8 +27,6 @@
 #include "omap-gpmc-smsc9221.dtsi"
 
  {
-   ranges = <5 0 0x2c00 0x100>;/* CS5 */
-
ethernet@gpmc {
reg = <5 0 0xff>;
interrupt-parent = <>;
--- a/arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi
@@ -15,9 +15,6 @@
 #include "omap-gpmc-smsc9221.dtsi"
 
  {
-   ranges = <4 0 0x2b00 0x100>,/* CS4 */
-<5 0 0x2c00 0x100>;/* CS5 */
-
smsc1: ethernet@gpmc {
reg = <5 0 0xff>;
interrupt-parent = <>;