diff options
author | Matt Carlson <mcarlson@broadcom.com> | 2009-08-25 06:08:42 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-26 18:47:53 -0400 |
commit | 5e7ccf2003e6a9c35b5aa24953ba5009a1a8b653 (patch) | |
tree | 5533444c48b514dd9ebcd1ae8d63c374ecf85ddb /drivers/net | |
parent | e7126997342560533317d8467e8516119ebcbd21 (diff) |
tg3: Add 57788, remove 57720
This patch adds support for the 57788 and removes support for the 57720
which was never released.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Reviewed-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/tg3.c | 5 | ||||
-rw-r--r-- | drivers/net/tg3.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 356b5d0f0403..9ae332083585 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -223,7 +223,7 @@ static struct pci_device_id tg3_pci_tbl[] = { | |||
223 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57780)}, | 223 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57780)}, |
224 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57760)}, | 224 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57760)}, |
225 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57790)}, | 225 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57790)}, |
226 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57720)}, | 226 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57788)}, |
227 | {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9DXX)}, | 227 | {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9DXX)}, |
228 | {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9MXX)}, | 228 | {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9MXX)}, |
229 | {PCI_DEVICE(PCI_VENDOR_ID_ALTIMA, PCI_DEVICE_ID_ALTIMA_AC1000)}, | 229 | {PCI_DEVICE(PCI_VENDOR_ID_ALTIMA, PCI_DEVICE_ID_ALTIMA_AC1000)}, |
@@ -11525,6 +11525,9 @@ out_not_found: | |||
11525 | else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780 && | 11525 | else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780 && |
11526 | tp->pdev->device == TG3PCI_DEVICE_TIGON3_57790) | 11526 | tp->pdev->device == TG3PCI_DEVICE_TIGON3_57790) |
11527 | strcpy(tp->board_part_number, "BCM57790"); | 11527 | strcpy(tp->board_part_number, "BCM57790"); |
11528 | else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780 && | ||
11529 | tp->pdev->device == TG3PCI_DEVICE_TIGON3_57788) | ||
11530 | strcpy(tp->board_part_number, "BCM57788"); | ||
11528 | else | 11531 | else |
11529 | strcpy(tp->board_part_number, "none"); | 11532 | strcpy(tp->board_part_number, "none"); |
11530 | } | 11533 | } |
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index bb8591ea3300..636008cf3c8d 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h | |||
@@ -43,7 +43,7 @@ | |||
43 | #define TG3PCI_DEVICE_TIGON3_57780 0x1692 | 43 | #define TG3PCI_DEVICE_TIGON3_57780 0x1692 |
44 | #define TG3PCI_DEVICE_TIGON3_57760 0x1690 | 44 | #define TG3PCI_DEVICE_TIGON3_57760 0x1690 |
45 | #define TG3PCI_DEVICE_TIGON3_57790 0x1694 | 45 | #define TG3PCI_DEVICE_TIGON3_57790 0x1694 |
46 | #define TG3PCI_DEVICE_TIGON3_57720 0x168c | 46 | #define TG3PCI_DEVICE_TIGON3_57788 0x1691 |
47 | /* 0x04 --> 0x64 unused */ | 47 | /* 0x04 --> 0x64 unused */ |
48 | #define TG3PCI_MSI_DATA 0x00000064 | 48 | #define TG3PCI_MSI_DATA 0x00000064 |
49 | /* 0x66 --> 0x68 unused */ | 49 | /* 0x66 --> 0x68 unused */ |