diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2014-10-01 23:44:17 +0200 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2014-10-31 21:44:31 +0100 |
commit | 98ba16bb22d12740a246b8339db4969e2822ce33 (patch) | |
tree | 1319ad07b5ec3b1a52b989cba247112c077a2078 /arch/arm/boot/dts/ste-nomadik-s8815.dts | |
parent | 43c4034963d6e838d971cbe59bfe84ae6e8370e6 (diff) | |
download | linux-98ba16bb22d12740a246b8339db4969e2822ce33.tar.bz2 |
ARM: nomadik: push ethernet down to board
The SoC file defines the location and type of the ethernet
adapter, this should be in the per-board file, as it is by no
means necessary to have an ethernet adapter connected to this
memory space.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/ste-nomadik-s8815.dts')
-rw-r--r-- | arch/arm/boot/dts/ste-nomadik-s8815.dts | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts index 33caad8df276..e411ff7769fe 100644 --- a/arch/arm/boot/dts/ste-nomadik-s8815.dts +++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts @@ -4,6 +4,7 @@ */ /dts-v1/; +#include <dt-bindings/interrupt-controller/irq.h> #include "ste-nomadik-stn8815.dtsi" / { @@ -14,14 +15,6 @@ bootargs = "root=/dev/ram0 console=ttyAMA1,115200n8 earlyprintk"; }; - /* This is where the interrupt is routed on the S8815 board */ - external-bus@34000000 { - ethernet@300 { - interrupt-parent = <&gpio3>; - interrupts = <8 0x1>; - }; - }; - src@101e0000 { /* These chrystal drivers are not used on this board */ disable-sxtalo; @@ -73,6 +66,21 @@ }; }; + /* Ethernet */ + external-bus@34000000 { + compatible = "simple-bus"; + reg = <0x34000000 0x1000000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x34000000 0x1000000>; + ethernet@300 { + compatible = "smsc,lan91c111"; + reg = <0x300 0x0fd00>; + interrupt-parent = <&gpio3>; + interrupts = <8 IRQ_TYPE_EDGE_RISING>; + }; + }; + /* GPIO I2C connected to the USB portions of the STw4811 only */ gpio-i2c { compatible = "i2c-gpio"; |