[ar71xx] ag71xx driver: apply 2.6.28 specific patches

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / drivers / net / ag71xx / ag71xx_mdio.c

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_mdio.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_mdio.c
index 2cd1ea3224e6780cd9ca89bbae00638e9aa40824..7e6452b6e3d4f92793e8465ae9f09f5510f3bfc7 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_mdio.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_mdio.c
@@ -1,7 +1,7 @@
 /*
  *  Atheros AR71xx built-in ethernet mac driver
  *
- *  Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
  *
  *  Based on Atheros' AG7100 driver
@@ -32,12 +32,12 @@ static inline u32 ag71xx_mdio_rr(struct ag71xx_mdio *am, unsigned reg)
 static void ag71xx_mdio_dump_regs(struct ag71xx_mdio *am)
 {
        DBG("%s: mii_cfg=%08x, mii_cmd=%08x, mii_addr=%08x\n",
-               am->mii_bus.name,
+               am->mii_bus->name,
                ag71xx_mdio_rr(am, AG71XX_REG_MII_CFG),
                ag71xx_mdio_rr(am, AG71XX_REG_MII_CMD),
                ag71xx_mdio_rr(am, AG71XX_REG_MII_ADDR));
        DBG("%s: mii_ctrl=%08x, mii_status=%08x, mii_ind=%08x\n",
-               am->mii_bus.name,
+               am->mii_bus->name,
                ag71xx_mdio_rr(am, AG71XX_REG_MII_CTRL),
                ag71xx_mdio_rr(am, AG71XX_REG_MII_STATUS),
                ag71xx_mdio_rr(am, AG71XX_REG_MII_IND));
@@ -57,7 +57,7 @@ static int ag71xx_mdio_mii_read(struct ag71xx_mdio *am, int addr, int reg)
        while (ag71xx_mdio_rr(am, AG71XX_REG_MII_IND) & MII_IND_BUSY) {
                if (i-- == 0) {
                        printk(KERN_ERR "%s: mii_read timed out\n",
-                               am->mii_bus.name);
+                               am->mii_bus->name);
                        ret = 0xffff;
                        goto out;
                }
@@ -88,7 +88,7 @@ static void ag71xx_mdio_mii_write(struct ag71xx_mdio *am,
        while (ag71xx_mdio_rr(am, AG71XX_REG_MII_IND) & MII_IND_BUSY) {
                if (i-- == 0) {
                        printk(KERN_ERR "%s: mii_write timed out\n",
-                               am->mii_bus.name);
+                               am->mii_bus->name);
                        break;
                }
                udelay(AG71XX_MDIO_DELAY);
@@ -154,29 +154,33 @@ static int __init ag71xx_mdio_probe(struct platform_device *pdev)
                goto err_free_mdio;
        }
 
-       am->mii_bus.name = "ag71xx_mdio";
-       am->mii_bus.read = ag71xx_mdio_read;
-       am->mii_bus.write = ag71xx_mdio_write;
-       am->mii_bus.reset = ag71xx_mdio_reset;
-       am->mii_bus.irq = am->mii_irq;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
-       am->mii_bus.id = 0;
-#else
-       snprintf(am->mii_bus.id, MII_BUS_ID_SIZE, "%x", 0);
-#endif
-       am->mii_bus.priv = am;
-       am->mii_bus.dev = &pdev->dev;
+       am->mii_bus = mdiobus_alloc();
+       if (am->mii_bus == NULL) {
+               err = -ENOMEM;
+               goto err_iounmap;
+       }
+
+       am->mii_bus->name = "ag71xx_mdio";
+       am->mii_bus->read = ag71xx_mdio_read;
+       am->mii_bus->write = ag71xx_mdio_write;
+       am->mii_bus->reset = ag71xx_mdio_reset;
+       am->mii_bus->irq = am->mii_irq;
+       am->mii_bus->priv = am;
+       am->mii_bus->parent = &pdev->dev;
+       snprintf(am->mii_bus->id, MII_BUS_ID_SIZE, "%x", 0);
 
        pdata = pdev->dev.platform_data;
        if (pdata)
-               am->mii_bus.phy_mask = pdata->phy_mask;
+               am->mii_bus->phy_mask = pdata->phy_mask;
 
        for (i = 0; i < PHY_MAX_ADDR; i++)
                am->mii_irq[i] = PHY_POLL;
 
-       err = mdiobus_register(&am->mii_bus);
+       ag71xx_mdio_wr(am, AG71XX_REG_MAC_CFG1, 0);
+
+       err = mdiobus_register(am->mii_bus);
        if (err)
-               goto err_iounmap;
+               goto err_free_bus;
 
        ag71xx_mdio_dump_regs(am);
 
@@ -184,6 +188,8 @@ static int __init ag71xx_mdio_probe(struct platform_device *pdev)
        ag71xx_mdio_bus = am;
        return 0;
 
+ err_free_bus:
+       mdiobus_free(am->mii_bus);
  err_iounmap:
        iounmap(am->mdio_base);
  err_free_mdio:
@@ -198,7 +204,8 @@ static int __exit ag71xx_mdio_remove(struct platform_device *pdev)
 
        if (am) {
                ag71xx_mdio_bus = NULL;
-               mdiobus_unregister(&am->mii_bus);
+               mdiobus_unregister(am->mii_bus);
+               mdiobus_free(am->mii_bus);
                iounmap(am->mdio_base);
                kfree(am);
                platform_set_drvdata(pdev, NULL);