From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Wed, 9 Jul 2008 21:50:45 +0000 (-0400)
Subject: e1000: add support for 82545GM 64bit PCI-X copper variant
X-Git-Tag: v1.3.4-rc1~59
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8915f1189c1d29d8be7f4de325702d90a8988219;p=oweals%2Fu-boot.git

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 c31029ab55..060b518996 100644
--- 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 23b2eb9b49..c258bc2383 100644
--- 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 d061017911..165456bc8c 100644
--- 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