diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-12-12 00:28:35 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-12-12 01:50:45 -0600 |
| commit | e77b28eb199a8d637a00128b86baf515d4eba5fd (patch) | |
| tree | 4bd63c9312c3ff17da778de9db7bdf07fe9644e6 /arch/powerpc/boot/dts/mpc8641_hpcn.dts | |
| parent | ec9686c4a57ea46c97126660936f66e8a5eb87eb (diff) | |
| download | blackbird-op-linux-e77b28eb199a8d637a00128b86baf515d4eba5fd.tar.gz blackbird-op-linux-e77b28eb199a8d637a00128b86baf515d4eba5fd.zip | |
[POWERPC] FSL: enet device tree cleanups
* Removed address fields in ethernet nodes
* Removed #address-cells, #size-cells from gianfar nodes
* Added cell-index to gianfar and ucc ethernet nodes
* Added enet[0..3] labels
* Renamed compatible node for gianfar mdio to "fsl,gianfar-mdio"
* Removed device_type = "mdio"
The matching for gianfar mdio still supports the old "mdio"/"gianfar" combo
but it is now considered deprecated.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8641_hpcn.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8641_hpcn.dts | 40 |
1 files changed, 6 insertions, 34 deletions
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts index dc0efafd584f..ddd8fbbb2171 100644 --- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts +++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts @@ -93,9 +93,9 @@ mdio@24520 { #address-cells = <1>; #size-cells = <0>; - device_type = "mdio"; - compatible = "gianfar"; + compatible = "fsl,gianfar-mdio"; reg = <24520 20>; + phy0: ethernet-phy@0 { interrupt-parent = <&mpic>; interrupts = <a 1>; @@ -123,18 +123,11 @@ }; enet0: ethernet@24000 { - #address-cells = <1>; - #size-cells = <0>; + cell-index = <0>; device_type = "network"; model = "TSEC"; compatible = "gianfar"; reg = <24000 1000>; - /* - * mac-address is deprecated and will be removed - * in 2.6.25. Only recent versions of - * U-Boot support local-mac-address, however. - */ - mac-address = [ 00 00 00 00 00 00 ]; local-mac-address = [ 00 00 00 00 00 00 ]; interrupts = <1d 2 1e 2 22 2>; interrupt-parent = <&mpic>; @@ -143,18 +136,11 @@ }; enet1: ethernet@25000 { - #address-cells = <1>; - #size-cells = <0>; + cell-index = <1>; device_type = "network"; model = "TSEC"; compatible = "gianfar"; reg = <25000 1000>; - /* - * mac-address is deprecated and will be removed - * in 2.6.25. Only recent versions of - * U-Boot support local-mac-address, however. - */ - mac-address = [ 00 00 00 00 00 00 ]; local-mac-address = [ 00 00 00 00 00 00 ]; interrupts = <23 2 24 2 28 2>; interrupt-parent = <&mpic>; @@ -163,18 +149,11 @@ }; enet2: ethernet@26000 { - #address-cells = <1>; - #size-cells = <0>; + cell-index = <2>; device_type = "network"; model = "TSEC"; compatible = "gianfar"; reg = <26000 1000>; - /* - * mac-address is deprecated and will be removed - * in 2.6.25. Only recent versions of - * U-Boot support local-mac-address, however. - */ - mac-address = [ 00 00 00 00 00 00 ]; local-mac-address = [ 00 00 00 00 00 00 ]; interrupts = <1F 2 20 2 21 2>; interrupt-parent = <&mpic>; @@ -183,18 +162,11 @@ }; enet3: ethernet@27000 { - #address-cells = <1>; - #size-cells = <0>; + cell-index = <3>; device_type = "network"; model = "TSEC"; compatible = "gianfar"; reg = <27000 1000>; - /* - * mac-address is deprecated and will be removed - * in 2.6.25. Only recent versions of - * U-Boot support local-mac-address, however. - */ - mac-address = [ 00 00 00 00 00 00 ]; local-mac-address = [ 00 00 00 00 00 00 ]; interrupts = <25 2 26 2 27 2>; interrupt-parent = <&mpic>; |
