diff mbox

[U-Boot] e1000: add i211 and unprogrammed i210/i211 support

Message ID 80a3caa74daf2ee9cc06d1532deb3bff031422b7.1410127137.git.marcel@ziswiler.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Marcel Ziswiler Sept. 7, 2014, 10:03 p.m. UTC 
This patch adds support for i211 as well as unprogrammed aka tools only
i210/i211 chip support.

Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
---
 drivers/net/e1000.c | 6 ++++++
 include/pci_ids.h   | 2 ++
 2 files changed, 8 insertions(+)

Comments

Marek Vasut Sept. 8, 2014, 2:07 a.m. UTC | #1 
On Monday, September 08, 2014 at 12:03:50 AM, Marcel Ziswiler wrote:
> This patch adds support for i211 as well as unprogrammed aka tools only
> i210/i211 chip support.
> 
> Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>

Does the network really work with an i21x with unprogrammed iNVM ?

Best regards,
Marek Vasut
Tom Rini Oct. 27, 2014, 10:19 p.m. UTC | #2 
On Mon, Sep 08, 2014 at 12:03:50AM +0200, Marcel Ziswiler wrote:

> This patch adds support for i211 as well as unprogrammed aka tools only
> i210/i211 chip support.
> 
> Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>

Applied to u-boot/master, thanks!
Marcel Ziswiler Oct. 28, 2014, 1:07 a.m. UTC | #3 
On Mon, 2014-10-27 at 18:19 -0400, Tom Rini wrote:
> Applied to u-boot/master, thanks!

Please excuse my ignorance but I can't quite make this one out on
u-boot/master anywhere. Could you let me know of its commit hash?
Tom Rini Oct. 28, 2014, 11:15 a.m. UTC | #4 
On Tue, Oct 28, 2014 at 02:07:08AM +0100, Marcel Ziswiler wrote:

> On Mon, 2014-10-27 at 18:19 -0400, Tom Rini wrote:
> > Applied to u-boot/master, thanks!
> 
> Please excuse my ignorance but I can't quite make this one out on
> u-boot/master anywhere. Could you let me know of its commit hash?

Whoops, lost this in some rebase shuffle, applied and pushed now (and it
takes a little to sync out sometimes).
diff mbox

Patch

diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 6e8765c..ce19173 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -92,7 +92,10 @@  static struct pci_device_id e1000_supported[] = {
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_80003ES2LAN_SERDES_DPT},
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_80003ES2LAN_COPPER_SPT},
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_80003ES2LAN_SERDES_SPT},
+	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I210_UNPROGRAMMED},
+	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I211_UNPROGRAMMED},
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I210_COPPER},
+	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I211_COPPER},
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I210_COPPER_FLASHLESS},
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I210_SERDES},
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I210_SERDES_FLASHLESS},
@@ -1374,7 +1377,10 @@  e1000_set_mac_type(struct e1000_hw *hw)
 	case E1000_DEV_ID_ICH8_IGP_M:
 		hw->mac_type = e1000_ich8lan;
 		break;
+	case PCI_DEVICE_ID_INTEL_I210_UNPROGRAMMED:
+	case PCI_DEVICE_ID_INTEL_I211_UNPROGRAMMED:
 	case PCI_DEVICE_ID_INTEL_I210_COPPER:
+	case PCI_DEVICE_ID_INTEL_I211_COPPER:
 	case PCI_DEVICE_ID_INTEL_I210_COPPER_FLASHLESS:
 	case PCI_DEVICE_ID_INTEL_I210_SERDES:
 	case PCI_DEVICE_ID_INTEL_I210_SERDES_FLASHLESS:
diff --git a/include/pci_ids.h b/include/pci_ids.h
index f220c3a..f84c13a 100644
--- a/include/pci_ids.h
+++ b/include/pci_ids.h
@@ -2547,10 +2547,12 @@ 
 #define PCI_DEVICE_ID_INTEL_82380FB	0x124b
 #define PCI_DEVICE_ID_INTEL_82439	0x1250
 #define PCI_DEVICE_ID_INTEL_I210_UNPROGRAMMED		0x1531
+#define PCI_DEVICE_ID_INTEL_I211_UNPROGRAMMED		0x1532
 #define PCI_DEVICE_ID_INTEL_I210_COPPER			0x1533
 #define PCI_DEVICE_ID_INTEL_I210_SERDES			0x1536
 #define PCI_DEVICE_ID_INTEL_I210_1000BASEKX		0x1537
 #define PCI_DEVICE_ID_INTEL_I210_EXTPHY			0x1538
+#define PCI_DEVICE_ID_INTEL_I211_COPPER			0x1539
 #define PCI_DEVICE_ID_INTEL_I210_COPPER_FLASHLESS	0x157b
 #define PCI_DEVICE_ID_INTEL_I210_SERDES_FLASHLESS	0x157c
 #define PCI_DEVICE_ID_INTEL_80960_RP	0x1960