aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sky2.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@linux-foundation.org>2007-11-05 18:52:11 -0500
committerJeff Garzik <jeff@garzik.org>2007-11-10 04:25:08 -0500
commit44388c7ead4b2bae9f82bc0862475640c50f357d (patch)
treef40fae29bfec10ca398c7ba7a5f03514110ac4a2 /drivers/net/sky2.c
parentaf043aa54fd45774e61979d1748616c2a67f0da8 (diff)
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/net/sky2.c')
-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)
1820 sky2_write8(hw, SK_REG(port, LNK_LED_REG), 1820 sky2_write8(hw, SK_REG(port, LNK_LED_REG),
1821 LINKLED_ON | LINKLED_BLINK_OFF | LINKLED_LINKSYNC_OFF); 1821 LINKLED_ON | LINKLED_BLINK_OFF | LINKLED_LINKSYNC_OFF);
1822 1822
1823 if (hw->flags & SKY2_HW_NEWER_PHY) {
1824 u16 pg = gm_phy_read(hw, port, PHY_MARV_EXT_ADR);
1825 u16 led = PHY_M_LEDC_LOS_CTRL(1); /* link active */
1826
1827 switch(sky2->speed) {
1828 case SPEED_10:
1829 led |= PHY_M_LEDC_INIT_CTRL(7);
1830 break;
1831
1832 case SPEED_100:
1833 led |= PHY_M_LEDC_STA1_CTRL(7);
1834 break;
1835
1836 case SPEED_1000:
1837 led |= PHY_M_LEDC_STA0_CTRL(7);
1838 break;
1839 }
1840
1841 gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 3);
1842 gm_phy_write(hw, port, PHY_MARV_PHY_CTRL, led);
1843 gm_phy_write(hw, port, PHY_MARV_EXT_ADR, pg);
1844 }
1845
1846 if (netif_msg_link(sky2)) 1823 if (netif_msg_link(sky2))
1847 printk(KERN_INFO PFX 1824 printk(KERN_INFO PFX
1848 "%s: Link is up at %d Mbps, %s duplex, flow control %s\n", 1825 "%s: Link is up at %d Mbps, %s duplex, flow control %s\n",