e1000: add support for 82545GM 64bit PCI-X copper variant

This PCI-X e1000 variant works by just adding in the correct
PCI IDs in the appropriate places.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index c31029ab5502c34971d74c6185150af03e3e64a1..060b5189968e32dbc2c8db6fcfb40f8a9de97a6d 100644 (file)
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -75,6 +75,7 @@ static struct pci_device_id supported[] = {
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82544GC_LOM},
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82540EM},
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82545EM_COPPER},
+       {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82545GM_COPPER},
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82546EB_COPPER},
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82545EM_FIBER},
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82546EB_FIBER},
@@ -636,6 +637,7 @@ e1000_set_mac_type(struct e1000_hw *hw)
                hw->mac_type = e1000_82540;
                break;
        case E1000_DEV_ID_82545EM_COPPER:
+       case E1000_DEV_ID_82545GM_COPPER:
        case E1000_DEV_ID_82545EM_FIBER:
                hw->mac_type = e1000_82545;
                break;

diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h
index 23b2eb9b498a80ccb4e49a20740b34e3ba245a8f..c258bc2383e6526ab0bf1e12a18ee4cd0569c19f 100644 (file)
--- a/drivers/net/e1000.h
+++ b/drivers/net/e1000.h
@@ -217,13 +217,14 @@ struct e1000_phy_stats {
 #define E1000_DEV_ID_82544GC_LOM    0x100D
 #define E1000_DEV_ID_82540EM       0x100E
 #define E1000_DEV_ID_82540EM_LOM    0x1015
+#define E1000_DEV_ID_82545GM_COPPER 0x1026
 #define E1000_DEV_ID_82545EM_COPPER 0x100F
 #define E1000_DEV_ID_82545EM_FIBER  0x1011
 #define E1000_DEV_ID_82546EB_COPPER 0x1010
 #define E1000_DEV_ID_82546EB_FIBER  0x1012
 #define E1000_DEV_ID_82541ER       0x1078
 #define E1000_DEV_ID_82541GI_LF            0x107C
-#define NUM_DEV_IDS 15
+#define NUM_DEV_IDS 16
 
 #define NODE_ADDRESS_SIZE 6
 #define ETH_LENGTH_OF_ADDRESS 6

diff --git a/include/pci_ids.h b/include/pci_ids.h
index d061017911598a0265727ba90542102b5ab0988c..165456bc8ccb6976cd42d34a9f7aff31e5d6d1f2 100644 (file)
--- a/include/pci_ids.h
+++ b/include/pci_ids.h
@@ -1827,6 +1827,7 @@
 #define PCI_DEVICE_ID_INTEL_82545EM_FIBER      0x1011
 #define PCI_DEVICE_ID_INTEL_82546EB_FIBER      0x1012
 #define PCI_DEVICE_ID_INTEL_82540EM_LOM                0x1015
+#define PCI_DEVICE_ID_INTEL_82545GM_COPPER     0x1026
 #define PCI_DEVICE_ID_INTEL_82559              0x1030
 
 #define PCI_DEVICE_ID_INTEL_82562ET    0x1031