diff options
| author | Jeff Garzik <jgarzik@redhat.com> | 2004-04-13 06:56:28 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2004-04-13 06:56:28 -0400 |
| commit | d9224c2cfdb05384d29948a4c5e60a00a953a9b0 (patch) | |
| tree | 06040b2d7af898afafb6398e97e1cb878a2fe8b5 | |
| parent | e0d3e322be607f2196415b42155eab21bc78e040 (diff) | |
| parent | 0f54bd34deebef3d74865f27ffaa9c786f953983 (diff) | |
Merge redhat.com:/spare/repo/netdev-2.6/b44
into redhat.com:/spare/repo/net-drivers-2.6
| -rw-r--r-- | drivers/net/b44.c | 11 | ||||
| -rw-r--r-- | drivers/net/b44.h | 6 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 5d34c70d9365..5f5ffa68e40e 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c @@ -2,6 +2,8 @@ * * Copyright (C) 2002 David S. Miller (davem@redhat.com) * Fixed by Pekka Pietikainen (pp@ee.oulu.fi) + * + * Distribute under GPL. */ #include <linux/kernel.h> @@ -25,8 +27,8 @@ #define DRV_MODULE_NAME "b44" #define PFX DRV_MODULE_NAME ": " -#define DRV_MODULE_VERSION "0.92" -#define DRV_MODULE_RELDATE "Nov 4, 2003" +#define DRV_MODULE_VERSION "0.93" +#define DRV_MODULE_RELDATE "Mar, 2004" #define B44_DEF_MSG_ENABLE \ (NETIF_MSG_DRV | \ @@ -83,6 +85,10 @@ static int b44_debug = -1; /* -1 == use B44_DEF_MSG_ENABLE as value */ static struct pci_device_id b44_pci_tbl[] = { { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, + { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401B0, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, + { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401B1, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, { } /* terminate list with empty entry */ }; @@ -1178,7 +1184,6 @@ static int b44_init_hw(struct b44 *bp) { u32 val; - b44_disable_ints(bp); b44_chip_reset(bp); b44_phy_reset(bp); b44_setup_phy(bp); diff --git a/drivers/net/b44.h b/drivers/net/b44.h index 1686505558cd..9c9d4f8ba83f 100644 --- a/drivers/net/b44.h +++ b/drivers/net/b44.h @@ -1,8 +1,9 @@ #ifndef _B44_H #define _B44_H -/* Register layout. */ +/* Register layout. (These correspond to struct _bcmenettregs in bcm4400.) */ #define B44_DEVCTRL 0x0000UL /* Device Control */ +#define DEVCTRL_MPM 0x00000040 /* Magic Packet PME Enable (B0 only) */ #define DEVCTRL_PFE 0x00000080 /* Pattern Filtering Enable */ #define DEVCTRL_IPP 0x00000400 /* Internal EPHY Present */ #define DEVCTRL_EPR 0x00008000 /* EPHY Reset */ @@ -24,6 +25,7 @@ #define WKUP_LEN_P3_SHIFT 24 #define WKUP_LEN_D3 0x80000000 #define B44_ISTAT 0x0020UL /* Interrupt Status */ +#define ISTAT_LS 0x00000020 /* Link Change (B0 only) */ #define ISTAT_PME 0x00000040 /* Power Management Event */ #define ISTAT_TO 0x00000080 /* General Purpose Timeout */ #define ISTAT_DSCE 0x00000400 /* Descriptor Error */ @@ -41,6 +43,8 @@ #define B44_IMASK 0x0024UL /* Interrupt Mask */ #define IMASK_DEF (ISTAT_ERRORS | ISTAT_TO | ISTAT_RX | ISTAT_TX) #define B44_GPTIMER 0x0028UL /* General Purpose Timer */ +#define B44_ADDR_LO 0x0088UL /* ENET Address Lo (B0 only) */ +#define B44_ADDR_HI 0x008CUL /* ENET Address Hi (B0 only) */ #define B44_FILT_ADDR 0x0090UL /* ENET Filter Address */ #define B44_FILT_DATA 0x0094UL /* ENET Filter Data */ #define B44_TXBURST 0x00A0UL /* TX Max Burst Length */ diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 7b2e08288448..fd10fa3743b4 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1838,6 +1838,8 @@ #define PCI_DEVICE_ID_TIGON3_5901 0x170d #define PCI_DEVICE_ID_TIGON3_5901_2 0x170e #define PCI_DEVICE_ID_BCM4401 0x4401 +#define PCI_DEVICE_ID_BCM4401B0 0x4402 +#define PCI_DEVICE_ID_BCM4401B1 0x170c #define PCI_VENDOR_ID_ENE 0x1524 #define PCI_DEVICE_ID_ENE_1211 0x1211 |