diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2006-08-16 16:38:54 -0400 |
---|---|---|
committer | Auke Kok <juke-jan.h.kok@intel.com> | 2006-08-16 16:38:54 -0400 |
commit | c9c1b834c7b6e00badfd9a775682644f192f0357 (patch) | |
tree | 7e4f827b726c355bfea01f4229c23f9e5a9d171c /drivers | |
parent | 1a821ca59593d307e564800c2f25ed1f9e1e2a6f (diff) |
e1000: Allow NVM to setup LPLU for IGP2 and IGP3
Allow NVM to setup LPLU for IGP2 and IGP3. Only IGP needs LPLU D3
disabled during init here.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/e1000/e1000_hw.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c index 583518ae49ce..3728f33045c3 100644 --- a/drivers/net/e1000/e1000_hw.c +++ b/drivers/net/e1000/e1000_hw.c | |||
@@ -1324,11 +1324,14 @@ e1000_copper_link_igp_setup(struct e1000_hw *hw) | |||
1324 | E1000_WRITE_REG(hw, LEDCTL, led_ctrl); | 1324 | E1000_WRITE_REG(hw, LEDCTL, led_ctrl); |
1325 | } | 1325 | } |
1326 | 1326 | ||
1327 | /* disable lplu d3 during driver init */ | 1327 | /* The NVM settings will configure LPLU in D3 for IGP2 and IGP3 PHYs */ |
1328 | ret_val = e1000_set_d3_lplu_state(hw, FALSE); | 1328 | if (hw->phy_type == e1000_phy_igp) { |
1329 | if (ret_val) { | 1329 | /* disable lplu d3 during driver init */ |
1330 | DEBUGOUT("Error Disabling LPLU D3\n"); | 1330 | ret_val = e1000_set_d3_lplu_state(hw, FALSE); |
1331 | return ret_val; | 1331 | if (ret_val) { |
1332 | DEBUGOUT("Error Disabling LPLU D3\n"); | ||
1333 | return ret_val; | ||
1334 | } | ||
1332 | } | 1335 | } |
1333 | 1336 | ||
1334 | /* disable lplu d0 during driver init */ | 1337 | /* disable lplu d0 during driver init */ |