Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e7307fc authored by Emil Tantilov's avatar Emil Tantilov Committed by Jeff Kirsher
Browse files

ixgbe: remove instances of ixgbe_phy_aq for 82598 and 82599 



82598 and 82599 do not ship with this type of PHY

Signed-off-by: default avatarEmil Tantilov <emil.s.tantilov@intel.com>
Tested-by: default avatarStephen Ko <stephen.s.ko@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 860502bf

drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c

+0 −2
Original line number Diff line number Diff line
@@ -307,7 +307,6 @@ static enum ixgbe_media_type ixgbe_get_media_type_82598(struct ixgbe_hw *hw) 
	switch (hw->phy.type) {

	case ixgbe_phy_cu_unknown:

	case ixgbe_phy_tn:

	case ixgbe_phy_aq:

		media_type = ixgbe_media_type_copper;

		goto out;

	default:
@@ -1112,7 +1111,6 @@ static u32 ixgbe_get_supported_physical_layer_82598(struct ixgbe_hw *hw) 
	 * physical layer because 10GBase-T PHYs use LMS = KX4/KX */

	switch (hw->phy.type) {

	case ixgbe_phy_tn:

	case ixgbe_phy_aq:

	case ixgbe_phy_cu_unknown:

		hw->phy.ops.read_reg(hw, MDIO_PMA_EXTABLE,

		MDIO_MMD_PMAPMD, &ext_ability);

drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c

+0 −6
Original line number Diff line number Diff line
@@ -217,10 +217,6 @@ static s32 ixgbe_init_phy_ops_82599(struct ixgbe_hw *hw) 
		phy->ops.get_firmware_version =

		             &ixgbe_get_phy_firmware_version_tnx;

		break;

	case ixgbe_phy_aq:

		phy->ops.get_firmware_version =

			&ixgbe_get_phy_firmware_version_generic;

		break;

	default:

		break;

	}
@@ -340,7 +336,6 @@ static enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw) 
	switch (hw->phy.type) {

	case ixgbe_phy_cu_unknown:

	case ixgbe_phy_tn:

	case ixgbe_phy_aq:

		media_type = ixgbe_media_type_copper;

		goto out;

	default:
@@ -1805,7 +1800,6 @@ static u32 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw) 


	switch (hw->phy.type) {

	case ixgbe_phy_tn:

	case ixgbe_phy_aq:

	case ixgbe_phy_cu_unknown:

		hw->phy.ops.read_reg(hw, MDIO_PMA_EXTABLE, MDIO_MMD_PMAPMD,

							 &ext_ability);

drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c

+1 −0
Original line number Diff line number Diff line
@@ -870,6 +870,7 @@ static struct ixgbe_phy_operations phy_ops_X540 = { 
	.read_i2c_eeprom        = &ixgbe_read_i2c_eeprom_generic,

	.write_i2c_eeprom       = &ixgbe_write_i2c_eeprom_generic,

	.check_overtemp         = &ixgbe_tn_check_overtemp,

	.get_firmware_version   = &ixgbe_get_phy_firmware_version_generic,

};



struct ixgbe_info ixgbe_X540_info = {