diff options
-rw-r--r-- | drivers/serial/8250_pci.c | 11 | ||||
-rw-r--r-- | include/linux/pci_ids.h | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c index 5dfaa0926cfd..a2dac378bda9 100644 --- a/drivers/serial/8250_pci.c +++ b/drivers/serial/8250_pci.c | |||
@@ -943,6 +943,7 @@ enum pci_board_num_t { | |||
943 | 943 | ||
944 | pbn_b2_1_115200, | 944 | pbn_b2_1_115200, |
945 | pbn_b2_2_115200, | 945 | pbn_b2_2_115200, |
946 | pbn_b2_4_115200, | ||
946 | pbn_b2_8_115200, | 947 | pbn_b2_8_115200, |
947 | 948 | ||
948 | pbn_b2_1_460800, | 949 | pbn_b2_1_460800, |
@@ -1256,6 +1257,12 @@ static struct pciserial_board pci_boards[] __devinitdata = { | |||
1256 | .base_baud = 115200, | 1257 | .base_baud = 115200, |
1257 | .uart_offset = 8, | 1258 | .uart_offset = 8, |
1258 | }, | 1259 | }, |
1260 | [pbn_b2_4_115200] = { | ||
1261 | .flags = FL_BASE2, | ||
1262 | .num_ports = 4, | ||
1263 | .base_baud = 115200, | ||
1264 | .uart_offset = 8, | ||
1265 | }, | ||
1259 | [pbn_b2_8_115200] = { | 1266 | [pbn_b2_8_115200] = { |
1260 | .flags = FL_BASE2, | 1267 | .flags = FL_BASE2, |
1261 | .num_ports = 8, | 1268 | .num_ports = 8, |
@@ -1997,6 +2004,10 @@ static struct pci_device_id serial_pci_tbl[] = { | |||
1997 | { PCI_VENDOR_ID_PANACOM, PCI_DEVICE_ID_PANACOM_DUALMODEM, | 2004 | { PCI_VENDOR_ID_PANACOM, PCI_DEVICE_ID_PANACOM_DUALMODEM, |
1998 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | 2005 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, |
1999 | pbn_panacom2 }, | 2006 | pbn_panacom2 }, |
2007 | { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, | ||
2008 | PCI_VENDOR_ID_ESDGMBH, | ||
2009 | PCI_DEVICE_ID_ESDGMBH_CPCIASIO4, 0, 0, | ||
2010 | pbn_b2_4_115200 }, | ||
2000 | { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, | 2011 | { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, |
2001 | PCI_SUBVENDOR_ID_CHASE_PCIFAST, | 2012 | PCI_SUBVENDOR_ID_CHASE_PCIFAST, |
2002 | PCI_SUBDEVICE_ID_CHASE_PCIFAST4, 0, 0, | 2013 | PCI_SUBDEVICE_ID_CHASE_PCIFAST4, 0, 0, |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index d655378f1c63..8fb9c3e06eef 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -1697,6 +1697,8 @@ | |||
1697 | #define PCI_VENDOR_ID_ELECTRONICDESIGNGMBH 0x12f8 | 1697 | #define PCI_VENDOR_ID_ELECTRONICDESIGNGMBH 0x12f8 |
1698 | #define PCI_DEVICE_ID_LML_33R10 0x8a02 | 1698 | #define PCI_DEVICE_ID_LML_33R10 0x8a02 |
1699 | 1699 | ||
1700 | #define PCI_VENDOR_ID_ESDGMBH 0x12fe | ||
1701 | #define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111 | ||
1700 | 1702 | ||
1701 | #define PCI_VENDOR_ID_SIIG 0x131f | 1703 | #define PCI_VENDOR_ID_SIIG 0x131f |
1702 | #define PCI_SUBVENDOR_ID_SIIG 0x131f | 1704 | #define PCI_SUBVENDOR_ID_SIIG 0x131f |