diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-28 20:19:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-28 20:19:55 -0700 |
| commit | d96299537e43681942ea272e00b0e529aa5b5fa4 (patch) | |
| tree | 65e4df4142a7a0eb0ec0bfe70058771731e39194 | |
| parent | 1b8b22f44bc68b066c571ca2b5ab4fda123c15bd (diff) | |
| parent | 737c17561fb2c6a72810cca7d7c0b8bdc29bb120 (diff) | |
| download | kernel_samsung_tuna-d96299537e43681942ea272e00b0e529aa5b5fa4.zip kernel_samsung_tuna-d96299537e43681942ea272e00b0e529aa5b5fa4.tar.gz kernel_samsung_tuna-d96299537e43681942ea272e00b0e529aa5b5fa4.tar.bz2 | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
* master.kernel.org:/home/rmk/linux-2.6-serial:
[SERIAL] Support for Intashield 2 port PCI serial card
| -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 a1d322f..cd1979d 100644 --- a/drivers/serial/8250_pci.c +++ b/drivers/serial/8250_pci.c @@ -936,6 +936,7 @@ enum pci_board_num_t { pbn_b1_8_1382400, pbn_b2_1_115200, + pbn_b2_2_115200, pbn_b2_8_115200, pbn_b2_1_460800, @@ -1243,6 +1244,12 @@ static struct pciserial_board pci_boards[] __devinitdata = { .base_baud = 115200, .uart_offset = 8, }, + [pbn_b2_2_115200] = { + .flags = FL_BASE2, + .num_ports = 2, + .base_baud = 115200, + .uart_offset = 8, + }, [pbn_b2_8_115200] = { .flags = FL_BASE2, .num_ports = 8, @@ -2340,6 +2347,13 @@ static struct pci_device_id serial_pci_tbl[] = { pbn_b0_1_115200 }, /* + * IntaShield IS-200 + */ + { PCI_VENDOR_ID_INTASHIELD, PCI_DEVICE_ID_INTASHIELD_IS200, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, /* 135a.0811 */ + pbn_b2_2_115200 }, + + /* * These entries match devices with class COMMUNICATION_SERIAL, * COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL */ diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 4eae06b..4c2839e 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1726,6 +1726,9 @@ #define PCI_VENDOR_ID_DOMEX 0x134a #define PCI_DEVICE_ID_DOMEX_DMX3191D 0x0001 +#define PCI_VENDOR_ID_INTASHIELD 0x135a +#define PCI_DEVICE_ID_INTASHIELD_IS200 0x0d80 + #define PCI_VENDOR_ID_QUATECH 0x135C #define PCI_DEVICE_ID_QUATECH_QSC100 0x0010 #define PCI_DEVICE_ID_QUATECH_DSC100 0x0020 |