e1000e: LED settings in EEPROM ignored on 82571 and 82572
Do not override the customizable LED configuration set in the EEPROM. Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>hifive-unleashed-5.1
parent
afdafff130
commit
db94ce90d3
|
@ -1290,7 +1290,6 @@ static s32 e1000_setup_link_82571(struct e1000_hw *hw)
|
||||||
static s32 e1000_setup_copper_link_82571(struct e1000_hw *hw)
|
static s32 e1000_setup_copper_link_82571(struct e1000_hw *hw)
|
||||||
{
|
{
|
||||||
u32 ctrl;
|
u32 ctrl;
|
||||||
u32 led_ctrl;
|
|
||||||
s32 ret_val;
|
s32 ret_val;
|
||||||
|
|
||||||
ctrl = er32(CTRL);
|
ctrl = er32(CTRL);
|
||||||
|
@ -1305,11 +1304,6 @@ static s32 e1000_setup_copper_link_82571(struct e1000_hw *hw)
|
||||||
break;
|
break;
|
||||||
case e1000_phy_igp_2:
|
case e1000_phy_igp_2:
|
||||||
ret_val = e1000e_copper_link_setup_igp(hw);
|
ret_val = e1000e_copper_link_setup_igp(hw);
|
||||||
/* Setup activity LED */
|
|
||||||
led_ctrl = er32(LEDCTL);
|
|
||||||
led_ctrl &= IGP_ACTIVITY_LED_MASK;
|
|
||||||
led_ctrl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE);
|
|
||||||
ew32(LEDCTL, led_ctrl);
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return -E1000_ERR_PHY;
|
return -E1000_ERR_PHY;
|
||||||
|
|
Loading…
Reference in New Issue