diff --git a/sys/dev/e1000/e1000_api.c b/sys/dev/e1000/e1000_api.c --- a/sys/dev/e1000/e1000_api.c +++ b/sys/dev/e1000/e1000_api.c @@ -333,16 +333,16 @@ case E1000_DEV_ID_PCH_TGP_I219_V14: case E1000_DEV_ID_PCH_TGP_I219_LM15: case E1000_DEV_ID_PCH_TGP_I219_V15: - case E1000_DEV_ID_PCH_ADL_I219_LM16: - case E1000_DEV_ID_PCH_ADL_I219_V16: - case E1000_DEV_ID_PCH_RPL_I219_LM23: - case E1000_DEV_ID_PCH_RPL_I219_V23: mac->type = e1000_pch_tgp; break; + case E1000_DEV_ID_PCH_ADL_I219_LM16: + case E1000_DEV_ID_PCH_ADL_I219_V16: case E1000_DEV_ID_PCH_ADL_I219_LM17: case E1000_DEV_ID_PCH_ADL_I219_V17: case E1000_DEV_ID_PCH_RPL_I219_LM22: case E1000_DEV_ID_PCH_RPL_I219_V22: + case E1000_DEV_ID_PCH_RPL_I219_LM23: + case E1000_DEV_ID_PCH_RPL_I219_V23: mac->type = e1000_pch_adp; break; case E1000_DEV_ID_PCH_MTP_I219_LM18: @@ -353,8 +353,6 @@ case E1000_DEV_ID_PCH_LNL_I219_V20: case E1000_DEV_ID_PCH_LNL_I219_LM21: case E1000_DEV_ID_PCH_LNL_I219_V21: - mac->type = e1000_pch_mtp; - break; case E1000_DEV_ID_PCH_ARL_I219_LM24: case E1000_DEV_ID_PCH_ARL_I219_V24: case E1000_DEV_ID_PCH_PTP_I219_LM25: @@ -363,7 +361,7 @@ case E1000_DEV_ID_PCH_PTP_I219_V26: case E1000_DEV_ID_PCH_PTP_I219_LM27: case E1000_DEV_ID_PCH_PTP_I219_V27: - mac->type = e1000_pch_ptp; + mac->type = e1000_pch_mtp; break; case E1000_DEV_ID_82575EB_COPPER: case E1000_DEV_ID_82575EB_FIBER_SERDES: @@ -521,7 +519,6 @@ case e1000_pch_tgp: case e1000_pch_adp: case e1000_pch_mtp: - case e1000_pch_ptp: e1000_init_function_pointers_ich8lan(hw); break; case e1000_82575: diff --git a/sys/dev/e1000/e1000_hw.h b/sys/dev/e1000/e1000_hw.h --- a/sys/dev/e1000/e1000_hw.h +++ b/sys/dev/e1000/e1000_hw.h @@ -282,7 +282,6 @@ e1000_pch_tgp, e1000_pch_adp, e1000_pch_mtp, - e1000_pch_ptp, e1000_82575, e1000_82576, e1000_82580, diff --git a/sys/dev/e1000/e1000_ich8lan.c b/sys/dev/e1000/e1000_ich8lan.c --- a/sys/dev/e1000/e1000_ich8lan.c +++ b/sys/dev/e1000/e1000_ich8lan.c @@ -352,7 +352,6 @@ case e1000_pch_tgp: case e1000_pch_adp: case e1000_pch_mtp: - case e1000_pch_ptp: if (e1000_phy_is_accessible_pchlan(hw)) break; @@ -505,7 +504,6 @@ case e1000_pch_tgp: case e1000_pch_adp: case e1000_pch_mtp: - case e1000_pch_ptp: /* In case the PHY needs to be in mdio slow mode, * set slow mode and try to get the PHY id again. */ @@ -808,7 +806,6 @@ case e1000_pch_tgp: case e1000_pch_adp: case e1000_pch_mtp: - case e1000_pch_ptp: /* multicast address update for pch2 */ mac->ops.update_mc_addr_list = e1000_update_mc_addr_list_pch2lan; @@ -1854,7 +1851,6 @@ case e1000_pch_tgp: case e1000_pch_adp: case e1000_pch_mtp: - case e1000_pch_ptp: hw->phy.ops.init_params = e1000_init_phy_params_pchlan; break; default: @@ -2314,7 +2310,6 @@ case e1000_pch_tgp: case e1000_pch_adp: case e1000_pch_mtp: - case e1000_pch_ptp: sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG_ICH8M; break; default: @@ -3440,7 +3435,6 @@ case e1000_pch_tgp: case e1000_pch_adp: case e1000_pch_mtp: - case e1000_pch_ptp: bank1_offset = nvm->flash_bank_size; act_offset = E1000_ICH_NVM_SIG_WORD; @@ -4415,7 +4409,6 @@ case e1000_pch_tgp: case e1000_pch_adp: case e1000_pch_mtp: - case e1000_pch_ptp: word = NVM_COMPAT; valid_csum_mask = NVM_COMPAT_VALID_CSUM; break; diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1264,7 +1264,6 @@ case e1000_pch_tgp: case e1000_pch_adp: case e1000_pch_mtp: - case e1000_pch_ptp: case e1000_82574: case e1000_82583: case e1000_80003es2lan: @@ -2664,7 +2663,6 @@ case e1000_pch_tgp: case e1000_pch_adp: case e1000_pch_mtp: - case e1000_pch_ptp: pba = E1000_PBA_26K; break; case e1000_82575: @@ -2778,7 +2776,6 @@ case e1000_pch_tgp: case e1000_pch_adp: case e1000_pch_mtp: - case e1000_pch_ptp: hw->fc.high_water = 0x5C20; hw->fc.low_water = 0x5048; hw->fc.pause_time = 0x0650;