diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-12 20:44:46 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-12 20:44:46 +0200 |
| commit | 0ee8746a93e29a3d884f19598409a3bea8ff51ab (patch) | |
| tree | 1544d350005f0ff1403c21e2c795575e51901ae1 /drivers/qe/uec_phy.c | |
| parent | 456be17dbe0e22ee2be9fafa1ea8888ddf6bd514 (diff) | |
| parent | 1ca6d0df3ecb028e989f3489b95d021f4497477b (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'drivers/qe/uec_phy.c')
| -rw-r--r-- | drivers/qe/uec_phy.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c index 2d3a896d6f..9be784e6ad 100644 --- a/drivers/qe/uec_phy.c +++ b/drivers/qe/uec_phy.c @@ -351,6 +351,15 @@ static int marvell_config_aneg (struct uec_mii_info *mii_info) static int genmii_config_aneg (struct uec_mii_info *mii_info) { if (mii_info->autoneg) { + /* Speed up the common case, if link is already up, speed and + duplex match, skip auto neg as it already matches */ + if (!genmii_read_status(mii_info) && mii_info->link) + if (mii_info->duplex == DUPLEX_FULL && + mii_info->speed == SPEED_100) + if (mii_info->advertising & + ADVERTISED_100baseT_Full) + return 0; + config_genmii_advert (mii_info); genmii_restart_aneg (mii_info); } else @@ -389,7 +398,6 @@ static int genmii_update_link (struct uec_mii_info *mii_info) status = phy_read(mii_info, PHY_BMSR); } mii_info->link = 1; - udelay(500000); /* another 500 ms (results in faster booting) */ } else { if (status & PHY_BMSR_LS) mii_info->link = 1; |