aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-12-11 12:21:15 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-12-11 12:21:15 +0000
commitd38fd20cb7d2a6e5d38858dc341cedc2b0a6aec1 (patch)
tree155f473d2536e61c4a8e6dd186d1fc124cd90b71 /target/linux
parentac40715c5f60cb334ae34cd05d96603db7e79378 (diff)
downloadupstream-d38fd20cb7d2a6e5d38858dc341cedc2b0a6aec1.tar.gz
upstream-d38fd20cb7d2a6e5d38858dc341cedc2b0a6aec1.tar.bz2
upstream-d38fd20cb7d2a6e5d38858dc341cedc2b0a6aec1.zip
ar71xx: move mdio_bus reset code
SVN-Revision: 18749
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c7
-rw-r--r--target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c5
2 files changed, 5 insertions, 7 deletions
diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
index 88edb2fd4c..be8db3e262 100644
--- 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;
diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
index 0db0a4bf78..547f72edba 100644
--- 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);