Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / arch / powerpc / sysdev / tsi108_dev.c

diff --git a/arch/powerpc/sysdev/tsi108_dev.c b/arch/powerpc/sysdev/tsi108_dev.c
index 7d3b09b7d5449244683e97ab0b6539b9072a345c..a113d800cbf0eba4e5ac235fafa9e0bf363b425b 100644 (file)
--- a/arch/powerpc/sysdev/tsi108_dev.c
+++ b/arch/powerpc/sysdev/tsi108_dev.c
@@ -72,12 +72,11 @@ static int __init tsi108_eth_of_init(void)
        int ret;
 
        for (np = NULL, i = 0;
-            (np = of_find_compatible_node(np, "network", "tsi-ethernet")) != NULL;
+            (np = of_find_compatible_node(np, "network", "tsi108-ethernet")) != NULL;
             i++) {
                struct resource r[2];
-               struct device_node *phy;
+               struct device_node *phy, *mdio;
                hw_info tsi_eth_data;
-               const unsigned int *id;
                const unsigned int *phy_id;
                const void *mac_addr;
                const phandle *ph;
@@ -111,6 +110,13 @@ static int __init tsi108_eth_of_init(void)
                if (mac_addr)
                        memcpy(tsi_eth_data.mac_addr, mac_addr, 6);
 
+               ph = of_get_property(np, "mdio-handle", NULL);
+               mdio = of_find_node_by_phandle(*ph);
+               ret = of_address_to_resource(mdio, 0, &res);
+               of_node_put(mdio);
+               if (ret)
+                       goto unreg;
+
                ph = of_get_property(np, "phy-handle", NULL);
                phy = of_find_node_by_phandle(*ph);
 
@@ -119,20 +125,25 @@ static int __init tsi108_eth_of_init(void)
                        goto unreg;
                }
 
-               id = of_get_property(phy, "reg", NULL);
-               phy_id = of_get_property(phy, "phy-id", NULL);
-               ret = of_address_to_resource(phy, 0, &res);
-               if (ret) {
-                       of_node_put(phy);
-                       goto unreg;
-               }
+               phy_id = of_get_property(phy, "reg", NULL);
+
                tsi_eth_data.regs = r[0].start;
                tsi_eth_data.phyregs = res.start;
                tsi_eth_data.phy = *phy_id;
                tsi_eth_data.irq_num = irq_of_parse_and_map(np, 0);
-               if (of_device_is_compatible(phy, "bcm54xx"))
+
+               /* Some boards with the TSI108 bridge (e.g. Holly)
+                * have a miswiring of the ethernet PHYs which
+                * requires a workaround.  The special
+                * "txc-rxc-delay-disable" property enables this
+                * workaround.  FIXME: Need to port the tsi108_eth
+                * driver itself to phylib and use a non-misleading
+                * name for the workaround flag - it's not actually to
+                * do with the model of PHY in use */
+               if (of_get_property(phy, "txc-rxc-delay-disable", NULL))
                        tsi_eth_data.phy_type = TSI108_PHY_BCM54XX;
                of_node_put(phy);
+
                ret =
                    platform_device_add_data(tsi_eth_dev, &tsi_eth_data,
                                             sizeof(hw_info));