hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pull ethernet mac out of reset before registering the mdio_bus 

SVN-Revision: 14486
lede-17.01
Gabor Juhos 2009-02-12 14:06:58 +00:00
parent 823a6a8ad7
commit e746170640
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_mdio.c
View File

@ -170,6 +170,8 @@ static int __init ag71xx_mdio_probe(struct platform_device *pdev)
for (i = 0; i < PHY_MAX_ADDR; i++) for (i = 0; i < PHY_MAX_ADDR; i++)
am->mii_irq[i] = PHY_POLL; 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) if (err)
goto err_iounmap; goto err_iounmap;

24
target/linux/ar71xx/patches-2.6.28/802-ag71xx_mdio_dynamic_mdio_bus.patch
View File

@ -33,7 +33,7 @@
break; break;
} }
udelay(AG71XX_MDIO_DELAY); 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; goto err_free_mdio;
} }
@ -46,8 +46,10 @@
- am->mii_bus.parent = &pdev->dev; - am->mii_bus.parent = &pdev->dev;
- snprintf(am->mii_bus.id, MII_BUS_ID_SIZE, "%x", 0); - snprintf(am->mii_bus.id, MII_BUS_ID_SIZE, "%x", 0);
+ am->mii_bus = mdiobus_alloc(); + am->mii_bus = mdiobus_alloc();
+ if (am->mii_bus == NULL) + if (am->mii_bus == NULL) {
+ err = -NOMEM;
+ goto err_iounmap; + goto err_iounmap;
+ }
+ +
+ am->mii_bus->name = "ag71xx_mdio"; + am->mii_bus->name = "ag71xx_mdio";
+ am->mii_bus->read = ag71xx_mdio_read; + am->mii_bus->read = ag71xx_mdio_read;
@ -66,12 +68,26 @@
for (i = 0; i < PHY_MAX_ADDR; i++) for (i = 0; i < PHY_MAX_ADDR; i++)
am->mii_irq[i] = PHY_POLL; 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);
+ err = mdiobus_register(am->mii_bus); + err = mdiobus_register(am->mii_bus);
if (err) if (err)
goto err_iounmap; - goto err_iounmap;
+ goto err_free_bus;
@@ -194,7 +198,8 @@ static int __exit ag71xx_mdio_remove(str 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) { if (am) {
ag71xx_mdio_bus = NULL; ag71xx_mdio_bus = NULL;