Commit 12645a19 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller

igb: do not overwrite EEPROM LED settings

The igb driver was overwritting the LED settings that were configured via
EEPROM.  This is not correct behavior as the LED settings are meant to be
configured by EEPROM and not changed.  This change removes the code that
was setting the LED behavior on the interface.
Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f3e7841c
...@@ -1000,7 +1000,7 @@ static s32 igb_init_hw_82575(struct e1000_hw *hw) ...@@ -1000,7 +1000,7 @@ static s32 igb_init_hw_82575(struct e1000_hw *hw)
**/ **/
static s32 igb_setup_copper_link_82575(struct e1000_hw *hw) static s32 igb_setup_copper_link_82575(struct e1000_hw *hw)
{ {
u32 ctrl, led_ctrl; u32 ctrl;
s32 ret_val; s32 ret_val;
bool link; bool link;
...@@ -1015,11 +1015,6 @@ static s32 igb_setup_copper_link_82575(struct e1000_hw *hw) ...@@ -1015,11 +1015,6 @@ static s32 igb_setup_copper_link_82575(struct e1000_hw *hw)
break; break;
case e1000_phy_igp_3: case e1000_phy_igp_3:
ret_val = igb_copper_link_setup_igp(hw); ret_val = igb_copper_link_setup_igp(hw);
/* Setup activity LED */
led_ctrl = rd32(E1000_LEDCTL);
led_ctrl &= IGP_ACTIVITY_LED_MASK;
led_ctrl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE);
wr32(E1000_LEDCTL, led_ctrl);
break; break;
default: default:
ret_val = -E1000_ERR_PHY; ret_val = -E1000_ERR_PHY;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment