|
@@ -1010,6 +1010,7 @@ static int skip_tx_en_setup(struct serial_private *priv,
|
|
|
#define PCI_DEVICE_ID_TITAN_200EI 0xA016
|
|
|
#define PCI_DEVICE_ID_TITAN_200EISI 0xA017
|
|
|
#define PCI_DEVICE_ID_OXSEMI_16PCI958 0x9538
|
|
|
+#define PCIE_DEVICE_ID_NEO_2_OX_IBM 0x00F6
|
|
|
|
|
|
/* Unknown vendors/cards - this should not be in linux/pci_ids.h */
|
|
|
#define PCI_SUBDEVICE_ID_UNKNOWN_0x1584 0x1584
|
|
@@ -1410,7 +1411,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
|
|
|
.setup = pci_default_setup,
|
|
|
},
|
|
|
/*
|
|
|
- * For Oxford Semiconductor and Mainpine
|
|
|
+ * For Oxford Semiconductor Tornado based devices
|
|
|
*/
|
|
|
{
|
|
|
.vendor = PCI_VENDOR_ID_OXSEMI,
|
|
@@ -1428,6 +1429,14 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
|
|
|
.init = pci_oxsemi_tornado_init,
|
|
|
.setup = pci_default_setup,
|
|
|
},
|
|
|
+ {
|
|
|
+ .vendor = PCI_VENDOR_ID_DIGI,
|
|
|
+ .device = PCIE_DEVICE_ID_NEO_2_OX_IBM,
|
|
|
+ .subvendor = PCI_SUBVENDOR_ID_IBM,
|
|
|
+ .subdevice = PCI_ANY_ID,
|
|
|
+ .init = pci_oxsemi_tornado_init,
|
|
|
+ .setup = pci_default_setup,
|
|
|
+ },
|
|
|
/*
|
|
|
* Default "match everything" terminator entry
|
|
|
*/
|
|
@@ -3073,6 +3082,14 @@ static struct pci_device_id serial_pci_tbl[] = {
|
|
|
{ PCI_VENDOR_ID_MAINPINE, 0x4000, /* IQ Express 8 Port V.34 Super-G3 Fax */
|
|
|
PCI_VENDOR_ID_MAINPINE, 0x4008, 0, 0,
|
|
|
pbn_oxsemi_8_4000000 },
|
|
|
+
|
|
|
+ /*
|
|
|
+ * Digi/IBM PCIe 2-port Async EIA-232 Adapter utilizing OxSemi Tornado
|
|
|
+ */
|
|
|
+ { PCI_VENDOR_ID_DIGI, PCIE_DEVICE_ID_NEO_2_OX_IBM,
|
|
|
+ PCI_SUBVENDOR_ID_IBM, PCI_ANY_ID, 0, 0,
|
|
|
+ pbn_oxsemi_2_4000000 },
|
|
|
+
|
|
|
/*
|
|
|
* SBS Technologies, Inc. P-Octal and PMC-OCTPRO cards,
|
|
|
* from skokodyn@yahoo.com
|