aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000e/phy.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/phy.c')
-rw-r--r--drivers/net/ethernet/intel/e1000e/phy.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index 59c76a6815a0..da2be59505c0 100644
--- a/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c
@@ -1583,13 +1583,13 @@ s32 e1000e_check_downshift(struct e1000_hw *hw)
1583 case e1000_phy_gg82563: 1583 case e1000_phy_gg82563:
1584 case e1000_phy_bm: 1584 case e1000_phy_bm:
1585 case e1000_phy_82578: 1585 case e1000_phy_82578:
1586 offset = M88E1000_PHY_SPEC_STATUS; 1586 offset = M88E1000_PHY_SPEC_STATUS;
1587 mask = M88E1000_PSSR_DOWNSHIFT; 1587 mask = M88E1000_PSSR_DOWNSHIFT;
1588 break; 1588 break;
1589 case e1000_phy_igp_2: 1589 case e1000_phy_igp_2:
1590 case e1000_phy_igp_3: 1590 case e1000_phy_igp_3:
1591 offset = IGP01E1000_PHY_LINK_HEALTH; 1591 offset = IGP01E1000_PHY_LINK_HEALTH;
1592 mask = IGP01E1000_PLHR_SS_DOWNGRADE; 1592 mask = IGP01E1000_PLHR_SS_DOWNGRADE;
1593 break; 1593 break;
1594 default: 1594 default:
1595 /* speed downshift not supported */ 1595 /* speed downshift not supported */
@@ -1653,14 +1653,14 @@ s32 e1000_check_polarity_igp(struct e1000_hw *hw)
1653 1653
1654 if ((data & IGP01E1000_PSSR_SPEED_MASK) == 1654 if ((data & IGP01E1000_PSSR_SPEED_MASK) ==
1655 IGP01E1000_PSSR_SPEED_1000MBPS) { 1655 IGP01E1000_PSSR_SPEED_1000MBPS) {
1656 offset = IGP01E1000_PHY_PCS_INIT_REG; 1656 offset = IGP01E1000_PHY_PCS_INIT_REG;
1657 mask = IGP01E1000_PHY_POLARITY_MASK; 1657 mask = IGP01E1000_PHY_POLARITY_MASK;
1658 } else { 1658 } else {
1659 /* This really only applies to 10Mbps since 1659 /* This really only applies to 10Mbps since
1660 * there is no polarity for 100Mbps (always 0). 1660 * there is no polarity for 100Mbps (always 0).
1661 */ 1661 */
1662 offset = IGP01E1000_PHY_PORT_STATUS; 1662 offset = IGP01E1000_PHY_PORT_STATUS;
1663 mask = IGP01E1000_PSSR_POLARITY_REVERSED; 1663 mask = IGP01E1000_PSSR_POLARITY_REVERSED;
1664 } 1664 }
1665 1665
1666 ret_val = e1e_rphy(hw, offset, &data); 1666 ret_val = e1e_rphy(hw, offset, &data);
@@ -1900,7 +1900,7 @@ s32 e1000e_get_cable_length_igp_2(struct e1000_hw *hw)
1900s32 e1000e_get_phy_info_m88(struct e1000_hw *hw) 1900s32 e1000e_get_phy_info_m88(struct e1000_hw *hw)
1901{ 1901{
1902 struct e1000_phy_info *phy = &hw->phy; 1902 struct e1000_phy_info *phy = &hw->phy;
1903 s32 ret_val; 1903 s32 ret_val;
1904 u16 phy_data; 1904 u16 phy_data;
1905 bool link; 1905 bool link;
1906 1906
@@ -2253,7 +2253,7 @@ enum e1000_phy_type e1000e_get_phy_type_from_id(u32 phy_id)
2253 case M88E1011_I_PHY_ID: 2253 case M88E1011_I_PHY_ID:
2254 phy_type = e1000_phy_m88; 2254 phy_type = e1000_phy_m88;
2255 break; 2255 break;
2256 case IGP01E1000_I_PHY_ID: /* IGP 1 & 2 share this */ 2256 case IGP01E1000_I_PHY_ID: /* IGP 1 & 2 share this */
2257 phy_type = e1000_phy_igp_2; 2257 phy_type = e1000_phy_igp_2;
2258 break; 2258 break;
2259 case GG82563_E_PHY_ID: 2259 case GG82563_E_PHY_ID:
@@ -2317,7 +2317,7 @@ s32 e1000e_determine_phy_address(struct e1000_hw *hw)
2317 /* If phy_type is valid, break - we found our 2317 /* If phy_type is valid, break - we found our
2318 * PHY address 2318 * PHY address
2319 */ 2319 */
2320 if (phy_type != e1000_phy_unknown) 2320 if (phy_type != e1000_phy_unknown)
2321 return 0; 2321 return 0;
2322 2322
2323 usleep_range(1000, 2000); 2323 usleep_range(1000, 2000);