[ar71xx] pull ethernet mac out of reset before registering the mdio_bus

[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..4ff6df8fa238da1ba388e6e5f357d0395fb65869 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_mdio.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_mdio.c
@@ -159,13 +159,9 @@ static int __init ag71xx_mdio_probe(struct platform_device *pdev)
        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;
+       snprintf(am->mii_bus.id, MII_BUS_ID_SIZE, "%x", 0);
 
        pdata = pdev->dev.platform_data;
        if (pdata)
@@ -174,6 +170,8 @@ static int __init ag71xx_mdio_probe(struct platform_device *pdev)
        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);
        if (err)
                goto err_iounmap;