diff options
| author | Peter Horton <pdh@colonel-panic.org> | 2006-08-26 04:07:36 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-08-27 06:59:49 -0400 |
| commit | 737c17561fb2c6a72810cca7d7c0b8bdc29bb120 (patch) | |
| tree | 3c18a3b61e08ed55076759139a331a18fadbbb95 | |
| parent | 3a13813e6effcfad5910d47b15b724621b50b878 (diff) | |
[SERIAL] Support for Intashield 2 port PCI serial card
Here is a patch that adds support for the Instashield IS-200 2 port PCI
serial card.
Signed-off-by: Peter Horton <pdh@colonel-panic.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | drivers/serial/8250_pci.c | 14 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 3 |
2 files changed, 17 insertions, 0 deletions
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c index a1d322f8a16c..cd1979daf2b8 100644 --- a/drivers/serial/8250_pci.c +++ b/drivers/serial/8250_pci.c | |||
| @@ -936,6 +936,7 @@ enum pci_board_num_t { | |||
| 936 | pbn_b1_8_1382400, | 936 | pbn_b1_8_1382400, |
| 937 | 937 | ||
| 938 | pbn_b2_1_115200, | 938 | pbn_b2_1_115200, |
| 939 | pbn_b2_2_115200, | ||
| 939 | pbn_b2_8_115200, | 940 | pbn_b2_8_115200, |
| 940 | 941 | ||
| 941 | pbn_b2_1_460800, | 942 | pbn_b2_1_460800, |
| @@ -1243,6 +1244,12 @@ static struct pciserial_board pci_boards[] __devinitdata = { | |||
| 1243 | .base_baud = 115200, | 1244 | .base_baud = 115200, |
| 1244 | .uart_offset = 8, | 1245 | .uart_offset = 8, |
| 1245 | }, | 1246 | }, |
| 1247 | [pbn_b2_2_115200] = { | ||
| 1248 | .flags = FL_BASE2, | ||
| 1249 | .num_ports = 2, | ||
| 1250 | .base_baud = 115200, | ||
| 1251 | .uart_offset = 8, | ||
| 1252 | }, | ||
| 1246 | [pbn_b2_8_115200] = { | 1253 | [pbn_b2_8_115200] = { |
| 1247 | .flags = FL_BASE2, | 1254 | .flags = FL_BASE2, |
| 1248 | .num_ports = 8, | 1255 | .num_ports = 8, |
| @@ -2340,6 +2347,13 @@ static struct pci_device_id serial_pci_tbl[] = { | |||
| 2340 | pbn_b0_1_115200 }, | 2347 | pbn_b0_1_115200 }, |
| 2341 | 2348 | ||
| 2342 | /* | 2349 | /* |
| 2350 | * IntaShield IS-200 | ||
| 2351 | */ | ||
| 2352 | { PCI_VENDOR_ID_INTASHIELD, PCI_DEVICE_ID_INTASHIELD_IS200, | ||
| 2353 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, /* 135a.0811 */ | ||
| 2354 | pbn_b2_2_115200 }, | ||
| 2355 | |||
| 2356 | /* | ||
| 2343 | * These entries match devices with class COMMUNICATION_SERIAL, | 2357 | * These entries match devices with class COMMUNICATION_SERIAL, |
| 2344 | * COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL | 2358 | * COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL |
| 2345 | */ | 2359 | */ |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 4eae06b08cf2..4c2839eab7f4 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1726,6 +1726,9 @@ | |||
| 1726 | #define PCI_VENDOR_ID_DOMEX 0x134a | 1726 | #define PCI_VENDOR_ID_DOMEX 0x134a |
| 1727 | #define PCI_DEVICE_ID_DOMEX_DMX3191D 0x0001 | 1727 | #define PCI_DEVICE_ID_DOMEX_DMX3191D 0x0001 |
| 1728 | 1728 | ||
| 1729 | #define PCI_VENDOR_ID_INTASHIELD 0x135a | ||
| 1730 | #define PCI_DEVICE_ID_INTASHIELD_IS200 0x0d80 | ||
| 1731 | |||
| 1729 | #define PCI_VENDOR_ID_QUATECH 0x135C | 1732 | #define PCI_VENDOR_ID_QUATECH 0x135C |
| 1730 | #define PCI_DEVICE_ID_QUATECH_QSC100 0x0010 | 1733 | #define PCI_DEVICE_ID_QUATECH_QSC100 0x0010 |
| 1731 | #define PCI_DEVICE_ID_QUATECH_DSC100 0x0020 | 1734 | #define PCI_DEVICE_ID_QUATECH_DSC100 0x0020 |
