eth: Support E1000E I225-V

1. Add pcie device id 0x15f3
2. Add IIC phy id 0x67C9DC00

Signed-off-by: ZhiJie.Zhang <zhangzhijie@bosc.ac.cn>

diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index b77298070f8562773e0f407ff68d07b7e0b01144..1c8767dbea29d94dc925a81f7f0d6b9eb329923d 100644 (file)
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -121,6 +121,7 @@ static struct pci_device_id e1000_supported[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I210_1000BASEKX) },
        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I225_UNPROGRAMMED) },
        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I225_IT) },
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I225_V) },
 
        {}
 };
@@ -1588,6 +1589,7 @@ e1000_set_mac_type(struct e1000_hw *hw)
        case PCI_DEVICE_ID_INTEL_I210_1000BASEKX:
        case PCI_DEVICE_ID_INTEL_I225_UNPROGRAMMED:
        case PCI_DEVICE_ID_INTEL_I225_IT:
+       case PCI_DEVICE_ID_INTEL_I225_V:
                hw->mac_type = e1000_igb;
                break;
        default:
@@ -4852,6 +4854,7 @@ static int e1000_set_phy_type (struct e1000_hw *hw)
                hw->phy_type = e1000_phy_igb;
                break;
        case I225_I_PHY_ID:
+       case I225_V_PHY_ID:
        case I226_LM_PHY_ID:
        case I226_I_PHY_ID:
                hw->phy_type = e1000_phy_igc;
@@ -4965,6 +4968,8 @@ e1000_detect_gig_phy(struct e1000_hw *hw)
                        match = true;
                if (hw->phy_id == I225_I_PHY_ID)
                        match = true;
+               if (hw->phy_id == I225_V_PHY_ID)
+                       match = true;
                if (hw->phy_id == I226_LM_PHY_ID)
                        match = true;
                if (hw->phy_id == I226_I_PHY_ID)

diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h
index 5ca720f4609876fcdd737bf22919efccda187622..cf8bd750757b9f16a3f787ca7ae8a90992e2b227 100644 (file)
--- a/drivers/net/e1000.h
+++ b/drivers/net/e1000.h
@@ -2420,6 +2420,7 @@ struct e1000_hw {
 #define I226_LM_PHY_ID         0x67C9DC10
 #define I225_I_PHY_ID          0x67C9DCC0
 #define I226_I_PHY_ID          0x67C9DCD0
+#define I225_V_PHY_ID          0x67C9DC00
 
 /* Miscellaneous PHY bit definitions. */
 #define PHY_PREAMBLE                   0xFFFFFFFF

diff --git a/include/pci_ids.h b/include/pci_ids.h
index a8939b105f144f1ac56f3befce73662f1e0e43b9..cfff275dabaafd8012dba9a7444b034b71b0feb9 100644 (file)
--- a/include/pci_ids.h
+++ b/include/pci_ids.h
@@ -2725,6 +2725,7 @@
 #define PCI_DEVICE_ID_INTEL_I210_SERDES_FLASHLESS      0x157c
 #define PCI_DEVICE_ID_INTEL_I225_UNPROGRAMMED          0x15fd
 #define PCI_DEVICE_ID_INTEL_I225_IT                    0x0d9f
+#define PCI_DEVICE_ID_INTEL_I225_V                     0x15f3
 #define PCI_DEVICE_ID_INTEL_80960_RP   0x1960
 #define PCI_DEVICE_ID_INTEL_82840_HB   0x1a21
 #define PCI_DEVICE_ID_INTEL_82845_HB   0x1a30