diff options
5 files changed, 27 insertions, 150 deletions
diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h index 96bfd21b50..f1c8491242 100644 --- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h +++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h @@ -102,7 +102,7 @@ struct ag71xx_ring { }; struct ag71xx_mdio { - struct mii_bus mii_bus; + struct mii_bus *mii_bus; int mii_irq[PHY_MAX_ADDR]; void __iomem *mdio_base; }; diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c index b30bde21be..01834887c5 100644 --- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c +++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c @@ -797,7 +797,7 @@ static int __init ag71xx_probe(struct platform_device *pdev) ag = netdev_priv(dev); ag->pdev = pdev; ag->dev = dev; - ag->mii_bus = &ag71xx_mdio_bus->mii_bus; + ag->mii_bus = ag71xx_mdio_bus->mii_bus; ag->msg_enable = netif_msg_init(ag71xx_debug, AG71XX_DEFAULT_MSG_ENABLE); spin_lock_init(&ag->lock); 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 6d33b7007d..7e6452b6e3 100644 --- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_mdio.c +++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_mdio.c @@ -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,27 +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; - am->mii_bus.priv = am; - am->mii_bus.dev = &pdev->dev; - snprintf(am->mii_bus.id, MII_BUS_ID_SIZE, "%x", 0); + 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; ag71xx_mdio_wr(am, AG71XX_REG_MAC_CFG1, 0); - err = mdiobus_register(&am->mii_bus); + err = mdiobus_register(am->mii_bus); if (err) - goto err_iounmap; + goto err_free_bus; ag71xx_mdio_dump_regs(am); @@ -182,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: @@ -196,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); diff --git a/target/linux/ar71xx/patches-2.6.28/801-ag71xx_rename_mii_bus_dev_to_mii_bus_parent.patch b/target/linux/ar71xx/patches-2.6.28/801-ag71xx_rename_mii_bus_dev_to_mii_bus_parent.patch deleted file mode 100644 index d9bd0b940d..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/801-ag71xx_rename_mii_bus_dev_to_mii_bus_parent.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/drivers/net/ag71xx/ag71xx_mdio.c -+++ b/drivers/net/ag71xx/ag71xx_mdio.c -@@ -160,7 +160,7 @@ static int __init ag71xx_mdio_probe(stru - am->mii_bus.reset = ag71xx_mdio_reset; - am->mii_bus.irq = am->mii_irq; - am->mii_bus.priv = am; -- am->mii_bus.dev = &pdev->dev; -+ am->mii_bus.parent = &pdev->dev; - snprintf(am->mii_bus.id, MII_BUS_ID_SIZE, "%x", 0); - - pdata = pdev->dev.platform_data; diff --git a/target/linux/ar71xx/patches-2.6.28/802-ag71xx_mdio_dynamic_mdio_bus.patch b/target/linux/ar71xx/patches-2.6.28/802-ag71xx_mdio_dynamic_mdio_bus.patch deleted file mode 100644 index 9d0584a591..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/802-ag71xx_mdio_dynamic_mdio_bus.patch +++ /dev/null @@ -1,121 +0,0 @@ ---- a/drivers/net/ag71xx/ag71xx_mdio.c -+++ b/drivers/net/ag71xx/ag71xx_mdio.c -@@ -32,12 +32,12 @@ static inline u32 ag71xx_mdio_rr(struct - 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 a - 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 - 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,27 +154,33 @@ static int __init ag71xx_mdio_probe(stru - 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; -- am->mii_bus.priv = am; -- am->mii_bus.parent = &pdev->dev; -- snprintf(am->mii_bus.id, MII_BUS_ID_SIZE, "%x", 0); -+ 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; - - ag71xx_mdio_wr(am, AG71XX_REG_MAC_CFG1, 0); - -- err = mdiobus_register(&am->mii_bus); -+ err = mdiobus_register(am->mii_bus); - if (err) -- goto err_iounmap; -+ goto err_free_bus; - - ag71xx_mdio_dump_regs(am); - -@@ -182,6 +188,8 @@ static int __init ag71xx_mdio_probe(stru - ag71xx_mdio_bus = am; - return 0; - -+ err_free_bus: -+ mdiobus_free(am->mii_bus); - err_iounmap: - iounmap(am->mdio_base); - err_free_mdio: -@@ -196,7 +204,8 @@ static int __exit ag71xx_mdio_remove(str - - 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); ---- a/drivers/net/ag71xx/ag71xx.h -+++ b/drivers/net/ag71xx/ag71xx.h -@@ -102,7 +102,7 @@ struct ag71xx_ring { - }; - - struct ag71xx_mdio { -- struct mii_bus mii_bus; -+ struct mii_bus *mii_bus; - int mii_irq[PHY_MAX_ADDR]; - void __iomem *mdio_base; - }; ---- a/drivers/net/ag71xx/ag71xx_main.c -+++ b/drivers/net/ag71xx/ag71xx_main.c -@@ -797,7 +797,7 @@ static int __init ag71xx_probe(struct pl - ag = netdev_priv(dev); - ag->pdev = pdev; - ag->dev = dev; -- ag->mii_bus = &ag71xx_mdio_bus->mii_bus; -+ ag->mii_bus = ag71xx_mdio_bus->mii_bus; - ag->msg_enable = netif_msg_init(ag71xx_debug, - AG71XX_DEFAULT_MSG_ENABLE); - spin_lock_init(&ag->lock); |