X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9ca0e2bdf5b7ec53c9dba240595b0acef1638f58..be11e989ca09a64632f976654f69c655f8808675:/target/linux/ar71xx/patches-2.6.28/802-ag71xx_mdio_dynamic_mdio_bus.patch

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 98f7339ee..9d0584a59 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
@@ -1,5 +1,20 @@
 --- 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) {
@@ -18,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;
  	}
  
@@ -31,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 = -ENOMEM;
 +		goto err_iounmap;
++	}
 +
 +	am->mii_bus->name = "ag71xx_mdio";
 +	am->mii_bus->read = ag71xx_mdio_read;
@@ -51,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;