diff options
author | Li Yang <leoli@freescale.com> | 2007-02-08 04:34:42 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-08 20:13:15 -0500 |
commit | a1862a53df1a57387aeee059276ba4233e12b4db (patch) | |
tree | b751b3feb96afb03af6dffdda2fa96b435c6ff40 /drivers/net/ucc_geth_phy.c | |
parent | 0ee8d33c64df9a719fd61ba693203e3b33b9e10a (diff) |
ucc_geth: Remove obsolete workaround of link speed change
The workaround used a long delay of 4s which caused problem
when two link-changes happens at the same time.
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Wu Xiaochuan <xiao-chuan.wu@freescale.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/ucc_geth_phy.c')
-rw-r--r-- | drivers/net/ucc_geth_phy.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ucc_geth_phy.c b/drivers/net/ucc_geth_phy.c index 3c86592ce03c..6fda6d88be49 100644 --- a/drivers/net/ucc_geth_phy.c +++ b/drivers/net/ucc_geth_phy.c | |||
@@ -376,6 +376,8 @@ static int marvell_init(struct ugeth_mii_info *mii_info) | |||
376 | ugphy_vdbg("%s: IN", __FUNCTION__); | 376 | ugphy_vdbg("%s: IN", __FUNCTION__); |
377 | 377 | ||
378 | ucc_geth_phy_write(mii_info, 0x14, 0x0cd2); | 378 | ucc_geth_phy_write(mii_info, 0x14, 0x0cd2); |
379 | ucc_geth_phy_write(mii_info, 0x1b, | ||
380 | (ucc_geth_phy_read(mii_info, 0x1b) & ~0x000f) | 0x000b); | ||
379 | ucc_geth_phy_write(mii_info, MII_BMCR, | 381 | ucc_geth_phy_write(mii_info, MII_BMCR, |
380 | ucc_geth_phy_read(mii_info, MII_BMCR) | BMCR_RESET); | 382 | ucc_geth_phy_read(mii_info, MII_BMCR) | BMCR_RESET); |
381 | msleep(4000); | 383 | msleep(4000); |