aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000e/ich8lan.c
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2013-06-28 21:15:16 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-07-28 06:44:39 -0400
commit91a3d82f380abe24e95a6d3981c06f13894eb2ce (patch)
tree31af3cd9928bdea96848c756d207afadf160d796 /drivers/net/ethernet/intel/e1000e/ich8lan.c
parent3ef672ab1862bbd44cc364e72ebd356783ab0243 (diff)
e1000e: enable support for new device IDs
The device IDs 0x15a0 and 0x15a1 are new SKUs that contain the same MAC as I217 and same PHY as I218. The device IDs 0x15a2 and 0x15a3 are the same as existing I218 SKUs. Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/ich8lan.c')
-rw-r--r--drivers/net/ethernet/intel/e1000e/ich8lan.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index b56c61acbac1..78d03d315421 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -1028,7 +1028,9 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
1028 1028
1029 /* Work-around I218 hang issue */ 1029 /* Work-around I218 hang issue */
1030 if ((hw->adapter->pdev->device == E1000_DEV_ID_PCH_LPTLP_I218_LM) || 1030 if ((hw->adapter->pdev->device == E1000_DEV_ID_PCH_LPTLP_I218_LM) ||
1031 (hw->adapter->pdev->device == E1000_DEV_ID_PCH_LPTLP_I218_V)) { 1031 (hw->adapter->pdev->device == E1000_DEV_ID_PCH_LPTLP_I218_V) ||
1032 (hw->adapter->pdev->device == E1000_DEV_ID_PCH_I218_LM3) ||
1033 (hw->adapter->pdev->device == E1000_DEV_ID_PCH_I218_V3)) {
1032 ret_val = e1000_k1_workaround_lpt_lp(hw, link); 1034 ret_val = e1000_k1_workaround_lpt_lp(hw, link);
1033 if (ret_val) 1035 if (ret_val)
1034 return ret_val; 1036 return ret_val;
@@ -4203,7 +4205,9 @@ void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw)
4203 u16 phy_reg, device_id = hw->adapter->pdev->device; 4205 u16 phy_reg, device_id = hw->adapter->pdev->device;
4204 4206
4205 if ((device_id == E1000_DEV_ID_PCH_LPTLP_I218_LM) || 4207 if ((device_id == E1000_DEV_ID_PCH_LPTLP_I218_LM) ||
4206 (device_id == E1000_DEV_ID_PCH_LPTLP_I218_V)) { 4208 (device_id == E1000_DEV_ID_PCH_LPTLP_I218_V) ||
4209 (device_id == E1000_DEV_ID_PCH_I218_LM3) ||
4210 (device_id == E1000_DEV_ID_PCH_I218_V3)) {
4207 u32 fextnvm6 = er32(FEXTNVM6); 4211 u32 fextnvm6 = er32(FEXTNVM6);
4208 4212
4209 ew32(FEXTNVM6, fextnvm6 & ~E1000_FEXTNVM6_REQ_PLL_CLK); 4213 ew32(FEXTNVM6, fextnvm6 & ~E1000_FEXTNVM6_REQ_PLL_CLK);