diff options
| author | Dale Farnsworth <dale@farnsworth.org> | 2008-04-08 08:11:27 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-04-15 21:21:24 +1000 |
| commit | a0916bd64a0e6636f0161480e04057c89e90c5da (patch) | |
| tree | e69f5a97dfe6de72a4d88b69508fb3048ff1107d /arch/powerpc/boot | |
| parent | 1791f91bc794b7efc90719268146f582b9f29ead (diff) | |
[POWERPC] mv643xx_eth: Prepare to support multiple silicon blocks
The mv643xx_eth driver is being modified to support multiple instances
of the ethernet silicon block on the same platform. Each block contains
a single register bank containing the registers for up to three ports
interleaved within that bank. This patch updates the PowerPC OF to
platform_device glue code to support multiple silicon blocks, each
with up to three ethernet ports. The main difference is that we now
allow multiple mv64x60_shared platform_devices to be registered and
we provide each port platform_device with a pointer to its associated
shared platform_device. The pointer will not be used until the
mv643xx_eth driver changes are committed.
Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Acked-by: Mark Greer <mgreer@mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/boot')
| -rw-r--r-- | arch/powerpc/boot/dts/prpmc2800.dts | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/arch/powerpc/boot/dts/prpmc2800.dts b/arch/powerpc/boot/dts/prpmc2800.dts index 88a1a895985..1ee6ff43dd5 100644 --- a/arch/powerpc/boot/dts/prpmc2800.dts +++ b/arch/powerpc/boot/dts/prpmc2800.dts @@ -91,21 +91,24 @@ }; }; - ethernet@2000 { + ethernet-group@2000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "marvell,mv64360-eth-group"; reg = <0x2000 0x2000>; - eth0 { + ethernet@0 { device_type = "network"; compatible = "marvell,mv64360-eth"; - block-index = <0>; + reg = <0>; interrupts = <32>; interrupt-parent = <&PIC>; phy = <&PHY0>; local-mac-address = [ 00 00 00 00 00 00 ]; }; - eth1 { + ethernet@1 { device_type = "network"; compatible = "marvell,mv64360-eth"; - block-index = <1>; + reg = <1>; interrupts = <33>; interrupt-parent = <&PIC>; phy = <&PHY1>; |