ixgbe: add MAC and PHY support for x540

[net-next-2.6.git] / drivers / net / ixgbe / ixgbe_82599.c

diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c
index 144c44a6b216e663d9df61c810c79b528d844c92..e34643eef1627c3d3a43633902bb55a2e3e31788 100644 (file)
--- 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)
                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;
        }
@@ -298,7 +302,8 @@ static enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw)
 
        /* Detect if there is a copper PHY attached. */
        if (hw->phy.type == ixgbe_phy_cu_unknown ||
-           hw->phy.type == ixgbe_phy_tn) {
+           hw->phy.type == ixgbe_phy_tn ||
+           hw->phy.type == ixgbe_phy_aq) {
                media_type = ixgbe_media_type_copper;
                goto out;
        }
@@ -1890,6 +1895,7 @@ static u32 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw)
        hw->phy.ops.identify(hw);
 
        if (hw->phy.type == ixgbe_phy_tn ||
+           hw->phy.type == ixgbe_phy_aq ||
            hw->phy.type == ixgbe_phy_cu_unknown) {
                hw->phy.ops.read_reg(hw, MDIO_PMA_EXTABLE, MDIO_MMD_PMAPMD,
                                     &ext_ability);