summaryrefslogtreecommitdiff
path: root/drivers/net/ucc_geth_phy.c
diff options
context:
space:
mode:
authorLi Yang <leoli@freescale.com>2007-02-08 17:34:42 +0800
committerJeff Garzik <jeff@garzik.org>2007-02-08 20:13:15 -0500
commita1862a53df1a57387aeee059276ba4233e12b4db (patch)
treeb751b3feb96afb03af6dffdda2fa96b435c6ff40 /drivers/net/ucc_geth_phy.c
parent0ee8d33c64df9a719fd61ba693203e3b33b9e10a (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.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ucc_geth_phy.c b/drivers/net/ucc_geth_phy.c
index 3c86592ce03..6fda6d88be4 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)
ugphy_vdbg("%s: IN", __FUNCTION__);
ucc_geth_phy_write(mii_info, 0x14, 0x0cd2);
+ ucc_geth_phy_write(mii_info, 0x1b,
+ (ucc_geth_phy_read(mii_info, 0x1b) & ~0x000f) | 0x000b);
ucc_geth_phy_write(mii_info, MII_BMCR,
ucc_geth_phy_read(mii_info, MII_BMCR) | BMCR_RESET);
msleep(4000);