[PATCH 4/8] powerpc: mv64x60 - Update ethernet DTS nodes

[Mark A. Greer]

From: Mark A. Greer <[EMAIL PROTECTED]>

DTS entries for mv64360 ethernet controllers should use 'reg' property
instead of the 'block-index' property.  Also, use 'multiethernet'
instead of 'ethernet' for parent node and use '[EMAIL PROTECTED]' instead of
'eth?' for subnodes.

Signed-off-by: Mark A. Greer <[EMAIL PROTECTED]>
---
 arch/powerpc/boot/dts/prpmc2800.dts |   10 +++++-----
 arch/powerpc/sysdev/mv64x60_dev.c   |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/powerpc/boot/dts/prpmc2800.dts 
b/arch/powerpc/boot/dts/prpmc2800.dts
index a4a3622..1447faa 100644
--- a/arch/powerpc/boot/dts/prpmc2800.dts
+++ b/arch/powerpc/boot/dts/prpmc2800.dts
@@ -110,21 +110,21 @@
                        };
                };
 
-               [EMAIL PROTECTED] {
+               [EMAIL PROTECTED] {
                        reg = <0x2000 0x2000>;
-                       eth0 {
+                       [EMAIL PROTECTED] {
                                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 {
+                       [EMAIL PROTECTED] {
                                device_type = "network";
                                compatible = "marvell,mv64360-eth";
-                               block-index = <1>;
+                               reg = <1>;
                                interrupts = <33>;
                                interrupt-parent = <&PIC>;
                                phy = <&PHY1>;
diff --git a/arch/powerpc/sysdev/mv64x60_dev.c 
b/arch/powerpc/sysdev/mv64x60_dev.c
index dca205f..20cd5e3 100644
--- a/arch/powerpc/sysdev/mv64x60_dev.c
+++ b/arch/powerpc/sysdev/mv64x60_dev.c
@@ -248,7 +248,7 @@ static int __init mv64x60_eth_device_setup(struct 
device_node *np, int id)
 
        memset(&pdata, 0, sizeof(pdata));
 
-       prop = of_get_property(np, "block-index", NULL);
+       prop = of_get_property(np, "reg", NULL);
        if (!prop)
                return -ENODEV;
        pdata.port_number = *prop;
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev