diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-30 06:46:19 +0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-30 06:46:19 +0400 |
| commit | 0a3108beea9143225119d5e7c72a8e2c64f3eb7d (patch) | |
| tree | 89ec500c03f0704799407265db21966b721c6d3f /arch/powerpc/boot/dts/gef_sbc610.dts | |
| parent | ec78c8ac16e7a5f45e21838ab2f5573200bfcdd3 (diff) | |
| parent | df4b6806d35ca6adedd5c0a7e36ac74af1c32d7a (diff) | |
| download | linux-0a3108beea9143225119d5e7c72a8e2c64f3eb7d.tar.xz | |
Merge commit 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/boot/dts/gef_sbc610.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/gef_sbc610.dts | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/arch/powerpc/boot/dts/gef_sbc610.dts b/arch/powerpc/boot/dts/gef_sbc610.dts index 714175ccb2a4..6582dbd36da7 100644 --- a/arch/powerpc/boot/dts/gef_sbc610.dts +++ b/arch/powerpc/boot/dts/gef_sbc610.dts @@ -202,34 +202,37 @@ }; }; - mdio@24520 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,gianfar-mdio"; - reg = <0x24520 0x20>; - - phy0: ethernet-phy@0 { - interrupt-parent = <&gef_pic>; - interrupts = <0x9 0x4>; - reg = <1>; - }; - phy2: ethernet-phy@2 { - interrupt-parent = <&gef_pic>; - interrupts = <0x8 0x4>; - reg = <3>; - }; - }; - enet0: ethernet@24000 { + #address-cells = <1>; + #size-cells = <1>; device_type = "network"; model = "eTSEC"; compatible = "gianfar"; reg = <0x24000 0x1000>; + ranges = <0x0 0x24000 0x1000>; local-mac-address = [ 00 00 00 00 00 00 ]; interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>; interrupt-parent = <&mpic>; phy-handle = <&phy0>; phy-connection-type = "gmii"; + + mdio@520 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,gianfar-mdio"; + reg = <0x520 0x20>; + + phy0: ethernet-phy@0 { + interrupt-parent = <&gef_pic>; + interrupts = <0x9 0x4>; + reg = <1>; + }; + phy2: ethernet-phy@2 { + interrupt-parent = <&gef_pic>; + interrupts = <0x8 0x4>; + reg = <3>; + }; + }; }; enet1: ethernet@26000 { |