Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd71af3c authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Tony Lindgren
Browse files

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 5c73cdf2
Loading
Loading
Loading
Loading
+3 −6
Original line number Diff line number Diff line
@@ -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 */