diff options
author | Paul Fulghum <paulkf@microgate.com> | 2006-06-25 08:49:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 13:01:24 -0400 |
commit | 6f84be84b4cde72fa2a2f0d10ac284a31e923200 (patch) | |
tree | b5ad8cd7a2e1a609e58469f023834c0a244bed72 | |
parent | 294dad05311416718c2a172738e1ca4071449877 (diff) |
[PATCH] synclink_gt: add GT2 adapter support
Add support for SyncLink GT2 adapter to driver.
Signed-off-by: Paul Fulghum <paulkf@microgate.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/char/synclink_gt.c | 8 | ||||
-rw-r--r-- | include/linux/synclink.h | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c index 41eab9831ad5..4e35d4181224 100644 --- a/drivers/char/synclink_gt.c +++ b/drivers/char/synclink_gt.c | |||
@@ -101,6 +101,7 @@ MODULE_LICENSE("GPL"); | |||
101 | 101 | ||
102 | static struct pci_device_id pci_table[] = { | 102 | static struct pci_device_id pci_table[] = { |
103 | {PCI_VENDOR_ID_MICROGATE, SYNCLINK_GT_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,}, | 103 | {PCI_VENDOR_ID_MICROGATE, SYNCLINK_GT_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,}, |
104 | {PCI_VENDOR_ID_MICROGATE, SYNCLINK_GT2_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,}, | ||
104 | {PCI_VENDOR_ID_MICROGATE, SYNCLINK_GT4_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,}, | 105 | {PCI_VENDOR_ID_MICROGATE, SYNCLINK_GT4_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,}, |
105 | {PCI_VENDOR_ID_MICROGATE, SYNCLINK_AC_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,}, | 106 | {PCI_VENDOR_ID_MICROGATE, SYNCLINK_AC_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,}, |
106 | {0,}, /* terminate list */ | 107 | {0,}, /* terminate list */ |
@@ -3277,6 +3278,9 @@ static void add_device(struct slgt_info *info) | |||
3277 | case SYNCLINK_GT_DEVICE_ID: | 3278 | case SYNCLINK_GT_DEVICE_ID: |
3278 | devstr = "GT"; | 3279 | devstr = "GT"; |
3279 | break; | 3280 | break; |
3281 | case SYNCLINK_GT2_DEVICE_ID: | ||
3282 | devstr = "GT2"; | ||
3283 | break; | ||
3280 | case SYNCLINK_GT4_DEVICE_ID: | 3284 | case SYNCLINK_GT4_DEVICE_ID: |
3281 | devstr = "GT4"; | 3285 | devstr = "GT4"; |
3282 | break; | 3286 | break; |
@@ -3354,7 +3358,9 @@ static void device_init(int adapter_num, struct pci_dev *pdev) | |||
3354 | int i; | 3358 | int i; |
3355 | int port_count = 1; | 3359 | int port_count = 1; |
3356 | 3360 | ||
3357 | if (pdev->device == SYNCLINK_GT4_DEVICE_ID) | 3361 | if (pdev->device == SYNCLINK_GT2_DEVICE_ID) |
3362 | port_count = 2; | ||
3363 | else if (pdev->device == SYNCLINK_GT4_DEVICE_ID) | ||
3358 | port_count = 4; | 3364 | port_count = 4; |
3359 | 3365 | ||
3360 | /* allocate device instances for all ports */ | 3366 | /* allocate device instances for all ports */ |
diff --git a/include/linux/synclink.h b/include/linux/synclink.h index b0e3535c38bf..0577f5284cbc 100644 --- a/include/linux/synclink.h +++ b/include/linux/synclink.h | |||
@@ -172,6 +172,7 @@ typedef struct _MGSL_PARAMS | |||
172 | #define SYNCLINK_GT_DEVICE_ID 0x0070 | 172 | #define SYNCLINK_GT_DEVICE_ID 0x0070 |
173 | #define SYNCLINK_GT4_DEVICE_ID 0x0080 | 173 | #define SYNCLINK_GT4_DEVICE_ID 0x0080 |
174 | #define SYNCLINK_AC_DEVICE_ID 0x0090 | 174 | #define SYNCLINK_AC_DEVICE_ID 0x0090 |
175 | #define SYNCLINK_GT2_DEVICE_ID 0x00A0 | ||
175 | #define MGSL_MAX_SERIAL_NUMBER 30 | 176 | #define MGSL_MAX_SERIAL_NUMBER 30 |
176 | 177 | ||
177 | /* | 178 | /* |