diff options
author | Don Skidmore <donald.c.skidmore@intel.com> | 2010-11-16 22:27:16 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2010-11-16 22:27:16 -0500 |
commit | fe15e8e1c78521e0b4e375d6ed415b82265419c9 (patch) | |
tree | 7e87256e93074b1950606562dab514f9ab8ba237 /drivers/net/ixgbe/ixgbe_phy.c | |
parent | a391f1d51244b8274920a33c5d11aeebec3aa68f (diff) |
ixgbe: add MAC and PHY support for x540
Adds the new x540.c file and Aquantia 1202 PHY for X540 support.
Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Stephen Ko <stephen.s.ko@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_phy.c')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_phy.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/drivers/net/ixgbe/ixgbe_phy.c b/drivers/net/ixgbe/ixgbe_phy.c index bc255ec48428..c445fbce56ee 100644 --- a/drivers/net/ixgbe/ixgbe_phy.c +++ b/drivers/net/ixgbe/ixgbe_phy.c | |||
@@ -115,6 +115,9 @@ static enum ixgbe_phy_type ixgbe_get_phy_type_from_id(u32 phy_id) | |||
115 | case TN1010_PHY_ID: | 115 | case TN1010_PHY_ID: |
116 | phy_type = ixgbe_phy_tn; | 116 | phy_type = ixgbe_phy_tn; |
117 | break; | 117 | break; |
118 | case AQ1202_PHY_ID: | ||
119 | phy_type = ixgbe_phy_aq; | ||
120 | break; | ||
118 | case QT2022_PHY_ID: | 121 | case QT2022_PHY_ID: |
119 | phy_type = ixgbe_phy_qt; | 122 | phy_type = ixgbe_phy_qt; |
120 | break; | 123 | break; |
@@ -433,8 +436,8 @@ s32 ixgbe_setup_phy_link_speed_generic(struct ixgbe_hw *hw, | |||
433 | * Determines the link capabilities by reading the AUTOC register. | 436 | * Determines the link capabilities by reading the AUTOC register. |
434 | */ | 437 | */ |
435 | s32 ixgbe_get_copper_link_capabilities_generic(struct ixgbe_hw *hw, | 438 | s32 ixgbe_get_copper_link_capabilities_generic(struct ixgbe_hw *hw, |
436 | ixgbe_link_speed *speed, | 439 | ixgbe_link_speed *speed, |
437 | bool *autoneg) | 440 | bool *autoneg) |
438 | { | 441 | { |
439 | s32 status = IXGBE_ERR_LINK_SETUP; | 442 | s32 status = IXGBE_ERR_LINK_SETUP; |
440 | u16 speed_ability; | 443 | u16 speed_ability; |
@@ -1411,6 +1414,22 @@ s32 ixgbe_get_phy_firmware_version_tnx(struct ixgbe_hw *hw, | |||
1411 | } | 1414 | } |
1412 | 1415 | ||
1413 | /** | 1416 | /** |
1417 | * ixgbe_get_phy_firmware_version_generic - Gets the PHY Firmware Version | ||
1418 | * @hw: pointer to hardware structure | ||
1419 | * @firmware_version: pointer to the PHY Firmware Version | ||
1420 | **/ | ||
1421 | s32 ixgbe_get_phy_firmware_version_generic(struct ixgbe_hw *hw, | ||
1422 | u16 *firmware_version) | ||
1423 | { | ||
1424 | s32 status = 0; | ||
1425 | |||
1426 | status = hw->phy.ops.read_reg(hw, AQ_FW_REV, MDIO_MMD_VEND1, | ||
1427 | firmware_version); | ||
1428 | |||
1429 | return status; | ||
1430 | } | ||
1431 | |||
1432 | /** | ||
1414 | * ixgbe_tn_check_overtemp - Checks if an overtemp occured. | 1433 | * ixgbe_tn_check_overtemp - Checks if an overtemp occured. |
1415 | * @hw: pointer to hardware structure | 1434 | * @hw: pointer to hardware structure |
1416 | * | 1435 | * |