diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2017-05-18 15:00:09 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2017-05-26 08:38:49 -0700 |
| commit | bd71af3c71b51b02f83e3987a3a44ca51894ae8a (patch) | |
| tree | e29b5696e8625b146260b24312c5f4334648effd | |
| parent | 5c73cdf2bdf0570599d2fb849e9f54889be6df18 (diff) | |
| download | blackbird-obmc-linux-bd71af3c71b51b02f83e3987a3a44ca51894ae8a.tar.gz blackbird-obmc-linux-bd71af3c71b51b02f83e3987a3a44ca51894ae8a.zip | |
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>
| -rw-r--r-- | arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi index f330c69cc683..82aa9c4a0f1c 100644 --- 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 */ |
