diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-12-11 12:21:15 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-12-11 12:21:15 +0000 |
| commit | 428adf203f8a216e91a1760321a91f33b0ccbc85 (patch) | |
| tree | b5d8713885584b50dc04b6733e7ca07252fe51f0 /target/linux/ar71xx | |
| parent | 0046f507ab664a8e17811bcb65d3b866661efa14 (diff) | |
| download | upstream-428adf203f8a216e91a1760321a91f33b0ccbc85.tar.gz upstream-428adf203f8a216e91a1760321a91f33b0ccbc85.tar.bz2 upstream-428adf203f8a216e91a1760321a91f33b0ccbc85.zip | |
ar71xx: move mdio_bus reset code
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18749 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx')
| -rw-r--r-- | target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c | 7 | ||||
| -rw-r--r-- | target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c | 5 |
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); |