From aa3b8bf9c30065bb2ea852799d32db5020598495 Mon Sep 17 00:00:00 2001 From: Wolfgang Grandegger Date: Wed, 28 May 2008 19:55:19 +0200 Subject: E1000: Add support for the 82541GI LF Intel Pro 1000 GT Desktop Adapter Signed-off-by: Wolfgang Grandegger Signed-off-by: Ben Warren --- include/pci_ids.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/pci_ids.h b/include/pci_ids.h index 61c22031e9c..d0610179115 100644 --- a/include/pci_ids.h +++ b/include/pci_ids.h @@ -1812,7 +1812,8 @@ #define PCI_DEVICE_ID_INTEL_82434 0x04a3 #define PCI_DEVICE_ID_INTEL_I960 0x0960 #define PCI_DEVICE_ID_INTEL_I960RM 0x0962 -#define PCI_DEVICE_ID_INTEL_82541ER 0x1078 +#define PCI_DEVICE_ID_INTEL_82541ER 0x1078 +#define PCI_DEVICE_ID_INTEL_82541GI_LF 0x107c #define PCI_DEVICE_ID_INTEL_82542 0x1000 #define PCI_DEVICE_ID_INTEL_82543GC_FIBER 0x1001 #define PCI_DEVICE_ID_INTEL_82543GC_COPPER 0x1004 -- cgit v1.2.3 From a101361bfe23c120321e45d114c0603b8e0763e9 Mon Sep 17 00:00:00 2001 From: Remy Bohmer Date: Tue, 3 Jun 2008 15:26:21 +0200 Subject: DM9000: Add data bus-width auto detection. The U-boot DM9000x driver contains a compile time bus-width definition for the databus connected to the network controller. This compile check makes the code unclear, inflexible and is unneccessary. It can be asked to the network controller what its bus-width is by reading bits 6 and 7 of the interrupt status register. The linux kernel already uses a runtime mechanism to determine this bus-width, so the implementation below looks somewhat like that implementation. This change has been tested with DM9000A, DM9000E, DM9000EP. Signed-off-by: Remy Bohmer Signed-off-by: Ben Warren --- include/configs/scb9328.h | 4 ---- include/configs/trizepsiv.h | 4 ---- 2 files changed, 8 deletions(-) (limited to 'include') diff --git a/include/configs/scb9328.h b/include/configs/scb9328.h index d140241bff4..4ae25adde04 100644 --- a/include/configs/scb9328.h +++ b/include/configs/scb9328.h @@ -256,14 +256,10 @@ #define CFG_CS5U_VAL 0x00008400 #define CFG_CS5L_VAL 0x00000D03 -#define CONFIG_DRIVER_DM9000 1 #define CONFIG_DRIVER_DM9000 1 #define CONFIG_DM9000_BASE 0x16000000 #define DM9000_IO CONFIG_DM9000_BASE #define DM9000_DATA (CONFIG_DM9000_BASE+4) -/* #define CONFIG_DM9000_USE_8BIT */ -#define CONFIG_DM9000_USE_16BIT -/* #define CONFIG_DM9000_USE_32BIT */ /* f_{dpll}=2*f{ref}*(MFI+MFN/(MFD+1))/(PD+1) f_ref=16,777MHz diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h index 25155ad3495..f77dd14f1a8 100644 --- a/include/configs/trizepsiv.h +++ b/include/configs/trizepsiv.h @@ -275,14 +275,10 @@ #define CFG_MCIO0_VAL 0x00008407 #define CFG_MCIO1_VAL 0x0000c108 -#define CONFIG_DRIVER_DM9000 1 #define CONFIG_DRIVER_DM9000 1 #define CONFIG_DM9000_BASE 0x08000000 #define DM9000_IO CONFIG_DM9000_BASE #define DM9000_DATA (CONFIG_DM9000_BASE+0x8004) -/* #define CONFIG_DM9000_USE_8BIT */ -/* #define CONFIG_DM9000_USE_16BIT */ -#define CONFIG_DM9000_USE_32BIT #define CONFIG_USB_OHCI_NEW 1 #define CFG_USB_OHCI_BOARD_INIT 1 -- cgit v1.2.3