aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@linux-foundation.org>2007-11-05 15:52:11 -0800
committerJeff Garzik <jeff@garzik.org>2007-11-10 04:25:08 -0500
commit44388c7ead4b2bae9f82bc0862475640c50f357d (patch)
treef40fae29bfec10ca398c7ba7a5f03514110ac4a2 /drivers
parentsky2: longer PHY delay (diff)
downloadlinux-dev-44388c7ead4b2bae9f82bc0862475640c50f357d.tar.xz
linux-dev-44388c7ead4b2bae9f82bc0862475640c50f357d.zip
sky2: dont change LED after autoneg
Don't need to change LED's after auto negotiation, the chip sets them correctly. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/sky2.c23
1 files changed, 0 insertions, 23 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index eaab3d87dcf3..3c08db41cec4 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1820,29 +1820,6 @@ static void sky2_link_up(struct sky2_port *sky2)
sky2_write8(hw, SK_REG(port, LNK_LED_REG),
LINKLED_ON | LINKLED_BLINK_OFF | LINKLED_LINKSYNC_OFF);
- if (hw->flags & SKY2_HW_NEWER_PHY) {
- u16 pg = gm_phy_read(hw, port, PHY_MARV_EXT_ADR);
- u16 led = PHY_M_LEDC_LOS_CTRL(1); /* link active */
-
- switch(sky2->speed) {
- case SPEED_10:
- led |= PHY_M_LEDC_INIT_CTRL(7);
- break;
-
- case SPEED_100:
- led |= PHY_M_LEDC_STA1_CTRL(7);
- break;
-
- case SPEED_1000:
- led |= PHY_M_LEDC_STA0_CTRL(7);
- break;
- }
-
- gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 3);
- gm_phy_write(hw, port, PHY_MARV_PHY_CTRL, led);
- gm_phy_write(hw, port, PHY_MARV_EXT_ADR, pg);
- }
-
if (netif_msg_link(sky2))
printk(KERN_INFO PFX
"%s: Link is up at %d Mbps, %s duplex, flow control %s\n",