ARM: dts: omap4-devkit8000: fix gpmc ranges property

With two separate &gpmc nodes the second ranges property overwrites the
first. So put nand and ethernet in a single node and merge the ranges.

While at it also fix the ethernet suffix.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
index f330c69cc683cef9d90dfced7ffd3b29f71eac48..82aa9c4a0f1c331f54c70409993ee17bdc493d00 100644 (file)
--- a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
+++ b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
@@ -201,7 +201,8 @@
 };
 
 &gpmc {
-       ranges = <0 0 0x30000000 0x1000000>;       /* CS0: 16MB for NAND */
+       ranges = <0 0 0x30000000 0x1000000      /* CS0: 16MB for NAND */
+                 6 0 0x2c000000 0x1000000>;    /* CS6: 16MB for DM9000 */
 
        nand@0,0 {
                compatible = "ti,omap2-nand";
@@ -256,12 +257,8 @@
                        reg = <0x680000 0xf980000>;
                };
        };
-};
-
-&gpmc {
-       ranges = <6 0 0x2c000000 0x1000000>;       /* CS6: 16MB for DM9000 */
 
-       ethernet@0,0 {
+       ethernet@6,0 {
                compatible = "davicom,dm9000";
                reg =  <6 0x000 2
                        6 0x400 2>; /* CS6, offset 0 and 0x400, IO size 2 */