aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe/ixgbe_82599.c
diff options
context:
space:
mode:
authorDon Skidmore <donald.c.skidmore@intel.com>2010-11-16 22:27:16 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2010-11-16 22:27:16 -0500
commitfe15e8e1c78521e0b4e375d6ed415b82265419c9 (patch)
tree7e87256e93074b1950606562dab514f9ab8ba237 /drivers/net/ixgbe/ixgbe_82599.c
parenta391f1d51244b8274920a33c5d11aeebec3aa68f (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_82599.c')
-rw-r--r--drivers/net/ixgbe/ixgbe_82599.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c
index 144c44a6b216..e34643eef162 100644
--- a/drivers/net/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ixgbe/ixgbe_82599.c
@@ -181,6 +181,10 @@ static s32 ixgbe_init_phy_ops_82599(struct ixgbe_hw *hw)
181 phy->ops.get_firmware_version = 181 phy->ops.get_firmware_version =
182 &ixgbe_get_phy_firmware_version_tnx; 182 &ixgbe_get_phy_firmware_version_tnx;
183 break; 183 break;
184 case ixgbe_phy_aq:
185 phy->ops.get_firmware_version =
186 &ixgbe_get_phy_firmware_version_generic;
187 break;
184 default: 188 default:
185 break; 189 break;
186 } 190 }
@@ -298,7 +302,8 @@ static enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw)
298 302
299 /* Detect if there is a copper PHY attached. */ 303 /* Detect if there is a copper PHY attached. */
300 if (hw->phy.type == ixgbe_phy_cu_unknown || 304 if (hw->phy.type == ixgbe_phy_cu_unknown ||
301 hw->phy.type == ixgbe_phy_tn) { 305 hw->phy.type == ixgbe_phy_tn ||
306 hw->phy.type == ixgbe_phy_aq) {
302 media_type = ixgbe_media_type_copper; 307 media_type = ixgbe_media_type_copper;
303 goto out; 308 goto out;
304 } 309 }
@@ -1890,6 +1895,7 @@ static u32 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw)
1890 hw->phy.ops.identify(hw); 1895 hw->phy.ops.identify(hw);
1891 1896
1892 if (hw->phy.type == ixgbe_phy_tn || 1897 if (hw->phy.type == ixgbe_phy_tn ||
1898 hw->phy.type == ixgbe_phy_aq ||
1893 hw->phy.type == ixgbe_phy_cu_unknown) { 1899 hw->phy.type == ixgbe_phy_cu_unknown) {
1894 hw->phy.ops.read_reg(hw, MDIO_PMA_EXTABLE, MDIO_MMD_PMAPMD, 1900 hw->phy.ops.read_reg(hw, MDIO_PMA_EXTABLE, MDIO_MMD_PMAPMD,
1895 &ext_ability); 1901 &ext_ability);