diff options
author | Tony Lindgren <tony@atomide.com> | 2015-01-06 08:49:57 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2015-01-06 08:49:57 -0800 |
commit | 7ac72746aa9bb305fa74b44ec73eae99bbbe9b66 (patch) | |
tree | 51ab5bcd9f7c504c8fda528dec9f6699a4e67c63 | |
parent | 69d2626f97b7f017ee4416b7dc071e9499c2c944 (diff) | |
download | linux-7ac72746aa9bb305fa74b44ec73eae99bbbe9b66.tar.gz linux-7ac72746aa9bb305fa74b44ec73eae99bbbe9b66.tar.bz2 linux-7ac72746aa9bb305fa74b44ec73eae99bbbe9b66.zip |
ARM: dts: Revert disabling of smc91x for n900
Revert "ARM: dts: Disable smc91x on n900 until bootloader
dependency is removed". We've now fixed the issues that
caused problems with uninitialized hardware depending on
the bootloader version. Mostly things got fixed with
the following commits:
9a894953a97b ("ARM: dts: Fix bootloader version dependencies by muxing n900 smc91x pins")
7d2911c43815 ("net: smc91x: Fix gpios for device tree based booting")
Note that this only affects the early development boards
with Ethernet that we still have in a few automated boot
test systems. And it's also available supposedly in some
versions of qemu.
Tested-by: Kevin Hilman <khilman@linaro.org>
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/boot/dts/omap3-n900.dts | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts index 53f3ca064140..b550c41b46f1 100644 --- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts @@ -700,11 +700,9 @@ }; }; + /* Ethernet is on some early development boards and qemu */ ethernet@gpmc { compatible = "smsc,lan91c94"; - - status = "disabled"; - interrupt-parent = <&gpio2>; interrupts = <22 IRQ_TYPE_LEVEL_HIGH>; /* gpio54 */ reg = <1 0x300 0xf>; /* 16 byte IO range at offset 0x300 */ |