ar71xx: move mdio_bus reset code

SVN-Revision: 18749
15 years ago · d38fd20cb7
parent ac40715c5f
commit d38fd20cb7
2 changed files with 5 additions and 7 deletions
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@ -917,13 +917,6 @@ static int __init ag71xx_probe(struct platform_device *pdev)

 	ag71xx_dump_regs(ag);

-	/* Reset the mdio bus explicitly */
-	if (ag->mii_bus) {
-		mutex_lock(&ag->mii_bus->mdio_lock);
-		ag->mii_bus->reset(ag->mii_bus);
-		mutex_unlock(&ag->mii_bus->mdio_lock);
-	}
-
 	platform_set_drvdata(pdev, dev);

 	return 0;
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
@ -308,6 +308,11 @@ int ag71xx_phy_connect(struct ag71xx *ag)
 		return -ENODEV;
 	}

+	/* Reset the mdio bus explicitly */
+	mutex_lock(&ag->mii_bus->mdio_lock);
+	ag->mii_bus->reset(ag->mii_bus);
+	mutex_unlock(&ag->mii_bus->mdio_lock);
+
 	if (pdata->phy_mask)
 		return ag71xx_phy_connect_multi(ag);