Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux

[linux-2.6-block.git] / drivers / net / fsl_pq_mdio.c

diff --git a/drivers/net/fsl_pq_mdio.c b/drivers/net/fsl_pq_mdio.c
index aa1eb88c21fc725196f4ff084b073b41298a4aa3..3af581303ca2b79577d18d0df4d6c64b6d341152 100644 (file)
--- a/drivers/net/fsl_pq_mdio.c
+++ b/drivers/net/fsl_pq_mdio.c
@@ -34,6 +34,7 @@
 #include <linux/mii.h>
 #include <linux/phy.h>
 #include <linux/of.h>
+#include <linux/of_mdio.h>
 #include <linux/of_platform.h>
 
 #include <asm/io.h>
@@ -154,44 +155,6 @@ static int fsl_pq_mdio_reset(struct mii_bus *bus)
        return 0;
 }
 
-/* Allocate an array which provides irq #s for each PHY on the given bus */
-static int *create_irq_map(struct device_node *np)
-{
-       int *irqs;
-       int i;
-       struct device_node *child = NULL;
-
-       irqs = kcalloc(PHY_MAX_ADDR, sizeof(int), GFP_KERNEL);
-
-       if (!irqs)
-               return NULL;
-
-       for (i = 0; i < PHY_MAX_ADDR; i++)
-               irqs[i] = PHY_POLL;
-
-       while ((child = of_get_next_child(np, child)) != NULL) {
-               int irq = irq_of_parse_and_map(child, 0);
-               const u32 *id;
-
-               if (irq == NO_IRQ)
-                       continue;
-
-               id = of_get_property(child, "reg", NULL);
-
-               if (!id)
-                       continue;
-
-               if (*id < PHY_MAX_ADDR && *id >= 0)
-                       irqs[*id] = irq;
-               else
-                       printk(KERN_WARNING "%s: "
-                                       "%d is not a valid PHY address\n",
-                                       np->full_name, *id);
-       }
-
-       return irqs;
-}
-
 void fsl_pq_mdio_bus_name(char *name, struct device_node *np)
 {
        const u32 *addr;
@@ -315,7 +278,7 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev,
 
        new_bus->priv = (void __force *)regs;
 
-       new_bus->irq = create_irq_map(np);
+       new_bus->irq = kcalloc(PHY_MAX_ADDR, sizeof(int), GFP_KERNEL);
 
        if (NULL == new_bus->irq) {
                err = -ENOMEM;
@@ -338,13 +301,17 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev,
                        of_device_is_compatible(np, "ucc_geth_phy")) {
 #ifdef CONFIG_UCC_GETH
                u32 id;
+               static u32 mii_mng_master;
 
                tbipa = &regs->utbipar;
 
                if ((err = get_ucc_id_for_range(addr, addr + size, &id)))
                        goto err_free_irqs;
 
-               ucc_set_qe_mux_mii_mng(id - 1);
+               if (!mii_mng_master) {
+                       mii_mng_master = id;
+                       ucc_set_qe_mux_mii_mng(id - 1);
+               }
 #else
                err = -ENODEV;
                goto err_free_irqs;
@@ -384,15 +351,7 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev,
 
        out_be32(tbipa, tbiaddr);
 
-       /*
-        * The TBIPHY-only buses will find PHYs at every address,
-        * so we mask them all but the TBI
-        */
-       if (of_device_is_compatible(np, "fsl,gianfar-tbi"))
-               new_bus->phy_mask = ~(1 << tbiaddr);
-
-       err = mdiobus_register(new_bus);
-
+       err = of_mdiobus_register(new_bus, np);
        if (err) {
                printk (KERN_ERR "%s: Cannot register as MDIO bus\n",
                                new_bus->name);
@@ -460,10 +419,10 @@ int __init fsl_pq_mdio_init(void)
 {
        return of_register_platform_driver(&fsl_pq_mdio_driver);
 }
+module_init(fsl_pq_mdio_init);
 
 void fsl_pq_mdio_exit(void)
 {
        of_unregister_platform_driver(&fsl_pq_mdio_driver);
 }
-subsys_initcall_sync(fsl_pq_mdio_init);
 module_exit(fsl_pq_mdio_exit);