diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2007-12-12 01:28:35 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-12-12 02:50:45 -0500 |
commit | e77b28eb199a8d637a00128b86baf515d4eba5fd (patch) | |
tree | 4bd63c9312c3ff17da778de9db7bdf07fe9644e6 /arch/powerpc/boot/dts/mpc832x_mds.dts | |
parent | ec9686c4a57ea46c97126660936f66e8a5eb87eb (diff) |
[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/mpc832x_mds.dts')
-rw-r--r-- | arch/powerpc/boot/dts/mpc832x_mds.dts | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts index f866e81f9368..b0d89d6aa5ac 100644 --- a/arch/powerpc/boot/dts/mpc832x_mds.dts +++ b/arch/powerpc/boot/dts/mpc832x_mds.dts | |||
@@ -208,20 +208,15 @@ | |||
208 | mode = "slave"; | 208 | mode = "slave"; |
209 | }; | 209 | }; |
210 | 210 | ||
211 | ucc@2200 { | 211 | enet0: ucc@2200 { |
212 | device_type = "network"; | 212 | device_type = "network"; |
213 | compatible = "ucc_geth"; | 213 | compatible = "ucc_geth"; |
214 | model = "UCC"; | 214 | model = "UCC"; |
215 | cell-index = <3>; | ||
215 | device-id = <3>; | 216 | device-id = <3>; |
216 | reg = <2200 200>; | 217 | reg = <2200 200>; |
217 | interrupts = <22>; | 218 | interrupts = <22>; |
218 | interrupt-parent = < &qeic >; | 219 | interrupt-parent = < &qeic >; |
219 | /* | ||
220 | * mac-address is deprecated and will be removed | ||
221 | * in 2.6.25. Only recent versions of | ||
222 | * U-Boot support local-mac-address, however. | ||
223 | */ | ||
224 | mac-address = [ 00 00 00 00 00 00 ]; | ||
225 | local-mac-address = [ 00 00 00 00 00 00 ]; | 220 | local-mac-address = [ 00 00 00 00 00 00 ]; |
226 | rx-clock = <19>; | 221 | rx-clock = <19>; |
227 | tx-clock = <1a>; | 222 | tx-clock = <1a>; |
@@ -229,20 +224,15 @@ | |||
229 | pio-handle = < &pio3 >; | 224 | pio-handle = < &pio3 >; |
230 | }; | 225 | }; |
231 | 226 | ||
232 | ucc@3200 { | 227 | enet1: ucc@3200 { |
233 | device_type = "network"; | 228 | device_type = "network"; |
234 | compatible = "ucc_geth"; | 229 | compatible = "ucc_geth"; |
235 | model = "UCC"; | 230 | model = "UCC"; |
231 | cell-index = <4>; | ||
236 | device-id = <4>; | 232 | device-id = <4>; |
237 | reg = <3200 200>; | 233 | reg = <3200 200>; |
238 | interrupts = <23>; | 234 | interrupts = <23>; |
239 | interrupt-parent = < &qeic >; | 235 | interrupt-parent = < &qeic >; |
240 | /* | ||
241 | * mac-address is deprecated and will be removed | ||
242 | * in 2.6.25. Only recent versions of | ||
243 | * U-Boot support local-mac-address, however. | ||
244 | */ | ||
245 | mac-address = [ 00 00 00 00 00 00 ]; | ||
246 | local-mac-address = [ 00 00 00 00 00 00 ]; | 236 | local-mac-address = [ 00 00 00 00 00 00 ]; |
247 | rx-clock = <17>; | 237 | rx-clock = <17>; |
248 | tx-clock = <18>; | 238 | tx-clock = <18>; |