From e7461706402ec2392d45c15ee95764b31683d694 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Thu, 12 Feb 2009 14:06:58 +0000 Subject: [PATCH] pull ethernet mac out of reset before registering the mdio_bus SVN-Revision: 14486 --- .../files/drivers/net/ag71xx/ag71xx_mdio.c | 2 ++ .../802-ag71xx_mdio_dynamic_mdio_bus.patch | 24 +++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) 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 01888f1105f1..4ff6df8fa238 100644 --- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_mdio.c +++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_mdio.c @@ -170,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; 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 index b7b7d58ea7a7..fa84e55501d2 100644 --- 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 @@ -33,7 +33,7 @@ break; } udelay(AG71XX_MDIO_DELAY); -@@ -154,23 +154,27 @@ static int __init ag71xx_mdio_probe(stru +@@ -154,27 +154,33 @@ static int __init ag71xx_mdio_probe(stru goto err_free_mdio; } @@ -46,8 +46,10 @@ - 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) ++ if (am->mii_bus == NULL) { ++ err = -NOMEM; + goto err_iounmap; ++ } + + am->mii_bus->name = "ag71xx_mdio"; + am->mii_bus->read = ag71xx_mdio_read; @@ -66,12 +68,26 @@ 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_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; -@@ -194,7 +198,8 @@ static int __exit ag71xx_mdio_remove(str ++ 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; -- 2.30.2