~hc/RK356X_SDK_RELEASE.git

..	..	@@ -43,14 +43,31 @@
43	43	void (exit)(struct pci_dev dev);
44	44	};
45	45
46		-#define PCI_NUM_BAR_RESOURCES 6
	46	+struct f815xxa_data {
	47	+ spinlock_t lock;
	48	+ int idx;
	49	+};
47	50
48	51	struct serial_private {
49	52	struct pci_dev *dev;
50	53	unsigned int nr;
51	54	struct pci_serial_quirk *quirk;
52	55	const struct pciserial_board *board;
53		- int line[0];
	56	+ int line[];
	57	+};
	58	+
	59	+#define PCI_DEVICE_ID_HPE_PCI_SERIAL 0x37e
	60	+
	61	+static const struct pci_device_id pci_use_msi[] = {
	62	+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9900,
	63	+ 0xA000, 0x1000) },
	64	+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9912,
	65	+ 0xA000, 0x1000) },
	66	+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9922,
	67	+ 0xA000, 0x1000) },
	68	+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_HP_3PAR, PCI_DEVICE_ID_HPE_PCI_SERIAL,
	69	+ PCI_ANY_ID, PCI_ANY_ID) },
	70	+ { }
54	71	};
55	72
56	73	static int pci_default_setup(struct serial_private*,
..	..	@@ -58,13 +75,12 @@
58	75
59	76	static void moan_device(const char str, struct pci_dev dev)
60	77	{
61		- dev_err(&dev->dev,
62		- "%s: %s\n"
	78	+ pci_err(dev, "%s\n"
63	79	"Please send the output of lspci -vv, this\n"
64	80	"message (0x%04x,0x%04x,0x%04x,0x%04x), the\n"
65	81	"manufacturer and name of serial board or\n"
66	82	"modem board to <linux-serial@vger.kernel.org>.\n",
67		- pci_name(dev), str, dev->vendor, dev->device,
	83	+ str, dev->vendor, dev->device,
68	84	dev->subsystem_vendor, dev->subsystem_device);
69	85	}
70	86
..	..	@@ -74,7 +90,7 @@
74	90	{
75	91	struct pci_dev *dev = priv->dev;
76	92
77		- if (bar >= PCI_NUM_BAR_RESOURCES)
	93	+ if (bar >= PCI_STD_NUM_BARS)
78	94	return -EINVAL;
79	95
80	96	if (pci_resource_flags(dev, bar) & IORESOURCE_MEM) {
..	..	@@ -221,7 +237,7 @@
221	237	/* is firmware started? */
222	238	pci_read_config_dword(dev, 0x44, &oldval);
223	239	if (oldval == 0x00001000L) { /* RESET value */
224		- dev_dbg(&dev->dev, "Local i960 firmware missing\n");
	240	+ pci_dbg(dev, "Local i960 firmware missing\n");
225	241	return -ENODEV;
226	242	}
227	243	return 0;
..	..	@@ -262,7 +278,7 @@
262	278	/*
263	279	* enable/disable interrupts
264	280	*/
265		- p = ioremap_nocache(pci_resource_start(dev, 0), 0x80);
	281	+ p = ioremap(pci_resource_start(dev, 0), 0x80);
266	282	if (p == NULL)
267	283	return -ENOMEM;
268	284	writel(irq_config, p + 0x4c);
..	..	@@ -286,7 +302,7 @@
286	302	/*
287	303	* disable interrupts
288	304	*/
289		- p = ioremap_nocache(pci_resource_start(dev, 0), 0x80);
	305	+ p = ioremap(pci_resource_start(dev, 0), 0x80);
290	306	if (p != NULL) {
291	307	writel(0, p + 0x4c);
292	308
..	..	@@ -462,7 +478,7 @@
462	478	break;
463	479	}
464	480
465		- p = ioremap_nocache(pci_resource_start(dev, 0), 0x80);
	481	+ p = ioremap(pci_resource_start(dev, 0), 0x80);
466	482	if (p == NULL)
467	483	return -ENOMEM;
468	484
..	..	@@ -571,9 +587,8 @@
571	587	* (0,2,3,5,6: serial only -- 7,8,9: serial + parallel)
572	588	*/
573	589	if ((dev->subsystem_device & 0x00f0) >= 0x70) {
574		- dev_info(&dev->dev,
575		- "ignoring Timedia subdevice %04x for parport_serial\n",
576		- dev->subsystem_device);
	590	+ pci_info(dev, "ignoring Timedia subdevice %04x for parport_serial\n",
	591	+ dev->subsystem_device);
577	592	return -ENODEV;
578	593	}
579	594
..	..	@@ -618,7 +633,7 @@
618	633	break;
619	634	case 3:
620	635	offset = board->uart_offset;
621		- /* FALLTHROUGH */
	636	+ fallthrough;
622	637	case 4: /* BAR 2 */
623	638	case 5: /* BAR 3 */
624	639	case 6: /* BAR 4 */
..	..	@@ -810,8 +825,7 @@
810	825	if (sub_serports > 0)
811	826	return sub_serports;
812	827
813		- dev_err(&dev->dev,
814		- "NetMos/Mostech serial driver ignoring port on ambiguous config.\n");
	828	+ pci_err(dev, "NetMos/Mostech serial driver ignoring port on ambiguous config.\n");
815	829	return 0;
816	830	}
817	831
..	..	@@ -880,18 +894,16 @@
880	894	/* enable IO_Space bit */
881	895	#define ITE_887x_POSIO_ENABLE (1 << 31)
882	896
	897	+/* inta_addr are the configuration addresses of the ITE */
	898	+static const short inta_addr[] = { 0x2a0, 0x2c0, 0x220, 0x240, 0x1e0, 0x200, 0x280 };
883	899	static int pci_ite887x_init(struct pci_dev *dev)
884	900	{
885		- /* inta_addr are the configuration addresses of the ITE */
886		- static const short inta_addr[] = { 0x2a0, 0x2c0, 0x220, 0x240, 0x1e0,
887		- 0x200, 0x280, 0 };
888	901	int ret, i, type;
889	902	struct resource *iobase = NULL;
890	903	u32 miscr, uartbar, ioport;
891	904
892	905	/* search for the base-ioport */
893		- i = 0;
894		- while (inta_addr[i] && iobase == NULL) {
	906	+ for (i = 0; i < ARRAY_SIZE(inta_addr); i++) {
895	907	iobase = request_region(inta_addr[i], ITE_887x_IOSIZE,
896	908	"ite887x");
897	909	if (iobase != NULL) {
..	..	@@ -908,13 +920,11 @@
908	920	break;
909	921	}
910	922	release_region(iobase->start, ITE_887x_IOSIZE);
911		- iobase = NULL;
912	923	}
913		- i++;
914	924	}
915	925
916		- if (!inta_addr[i]) {
917		- dev_err(&dev->dev, "ite887x: could not find iobase\n");
	926	+ if (i == ARRAY_SIZE(inta_addr)) {
	927	+ pci_err(dev, "could not find iobase\n");
918	928	return -ENODEV;
919	929	}
920	930
..	..	@@ -984,43 +994,29 @@
984	994	}
985	995
986	996	/*
987		- * EndRun Technologies.
988		- * Determine the number of ports available on the device.
	997	+ * Oxford Semiconductor Inc.
	998	+ * Check if an OxSemi device is part of the Tornado range of devices.
989	999	*/
990	1000	#define PCI_VENDOR_ID_ENDRUN 0x7401
991	1001	#define PCI_DEVICE_ID_ENDRUN_1588 0xe100
992	1002
993		-static int pci_endrun_init(struct pci_dev *dev)
	1003	+static bool pci_oxsemi_tornado_p(struct pci_dev *dev)
994	1004	{
995		- u8 __iomem *p;
996		- unsigned long deviceID;
997		- unsigned int number_uarts = 0;
	1005	+ /* OxSemi Tornado devices are all 0xCxxx */
	1006	+ if (dev->vendor == PCI_VENDOR_ID_OXSEMI &&
	1007	+ (dev->device & 0xf000) != 0xc000)
	1008	+ return false;
998	1009
999		- /* EndRun device is all 0xexxx */
	1010	+ /* EndRun devices are all 0xExxx */
1000	1011	if (dev->vendor == PCI_VENDOR_ID_ENDRUN &&
1001		- (dev->device & 0xf000) != 0xe000)
1002		- return 0;
	1012	+ (dev->device & 0xf000) != 0xe000)
	1013	+ return false;
1003	1014
1004		- p = pci_iomap(dev, 0, 5);
1005		- if (p == NULL)
1006		- return -ENOMEM;
1007		-
1008		- deviceID = ioread32(p);
1009		- /* EndRun device */
1010		- if (deviceID == 0x07000200) {
1011		- number_uarts = ioread8(p + 4);
1012		- dev_dbg(&dev->dev,
1013		- "%d ports detected on EndRun PCI Express device\n",
1014		- number_uarts);
1015		- }
1016		- pci_iounmap(dev, p);
1017		- return number_uarts;
	1015	+ return true;
1018	1016	}
1019	1017
1020	1018	/*
1021		- * Oxford Semiconductor Inc.
1022		- * Check that device is part of the Tornado range of devices, then determine
1023		- * the number of ports available on the device.
	1019	+ * Determine the number of ports available on a Tornado device.
1024	1020	*/
1025	1021	static int pci_oxsemi_tornado_init(struct pci_dev *dev)
1026	1022	{
..	..	@@ -1028,9 +1024,7 @@
1028	1024	unsigned long deviceID;
1029	1025	unsigned int number_uarts = 0;
1030	1026
1031		- /* OxSemi Tornado devices are all 0xCxxx */
1032		- if (dev->vendor == PCI_VENDOR_ID_OXSEMI &&
1033		- (dev->device & 0xF000) != 0xC000)
	1027	+ if (!pci_oxsemi_tornado_p(dev))
1034	1028	return 0;
1035	1029
1036	1030	p = pci_iomap(dev, 0, 5);
..	..	@@ -1041,9 +1035,10 @@
1041	1035	/* Tornado device */
1042	1036	if (deviceID == 0x07000200) {
1043	1037	number_uarts = ioread8(p + 4);
1044		- dev_dbg(&dev->dev,
1045		- "%d ports detected on Oxford PCI Express device\n",
1046		- number_uarts);
	1038	+ pci_dbg(dev, "%d ports detected on %s PCI Express device\n",
	1039	+ number_uarts,
	1040	+ dev->vendor == PCI_VENDOR_ID_ENDRUN ?
	1041	+ "EndRun" : "Oxford");
1047	1042	}
1048	1043	pci_iounmap(dev, p);
1049	1044	return number_uarts;
..	..	@@ -1103,15 +1098,15 @@
1103	1098	{ 0, }
1104	1099	};
1105	1100
1106		-static int pci_quatech_amcc(u16 devid)
	1101	+static int pci_quatech_amcc(struct pci_dev *dev)
1107	1102	{
1108	1103	struct quatech_feature *qf = &quatech_cards[0];
1109	1104	while (qf->devid) {
1110		- if (qf->devid == devid)
	1105	+ if (qf->devid == dev->device)
1111	1106	return qf->amcc;
1112	1107	qf++;
1113	1108	}
1114		- pr_err("quatech: unknown port type '0x%04X'.\n", devid);
	1109	+ pci_err(dev, "unknown port type '0x%04X'.\n", dev->device);
1115	1110	return 0;
1116	1111	};
1117	1112
..	..	@@ -1274,7 +1269,7 @@
1274	1269
1275	1270	static int pci_quatech_init(struct pci_dev *dev)
1276	1271	{
1277		- if (pci_quatech_amcc(dev->device)) {
	1272	+ if (pci_quatech_amcc(dev)) {
1278	1273	unsigned long base = pci_resource_start(dev, 0);
1279	1274	if (base) {
1280	1275	u32 tmp;
..	..	@@ -1298,7 +1293,7 @@
1298	1293	port->port.uartclk = pci_quatech_clock(port);
1299	1294	/* For now just warn about RS422 */
1300	1295	if (pci_quatech_rs422(port))
1301		- pr_warn("quatech: software control of RS422 features not currently supported.\n");
	1296	+ pci_warn(priv->dev, "software control of RS422 features not currently supported.\n");
1302	1297	return pci_default_setup(priv, board, port, idx);
1303	1298	}
1304	1299
..	..	@@ -1326,8 +1321,65 @@
1326	1321
1327	1322	return setup_port(priv, port, bar, offset, board->reg_shift);
1328	1323	}
	1324	+static void
	1325	+pericom_do_set_divisor(struct uart_port *port, unsigned int baud,
	1326	+ unsigned int quot, unsigned int quot_frac)
	1327	+{
	1328	+ int scr;
	1329	+ int lcr;
1329	1330
	1331	+ for (scr = 16; scr > 4; scr--) {
	1332	+ unsigned int maxrate = port->uartclk / scr;
	1333	+ unsigned int divisor = max(maxrate / baud, 1U);
	1334	+ int delta = maxrate / divisor - baud;
	1335	+
	1336	+ if (baud > maxrate + baud / 50)
	1337	+ continue;
	1338	+
	1339	+ if (delta > baud / 50)
	1340	+ divisor++;
	1341	+
	1342	+ if (divisor > 0xffff)
	1343	+ continue;
	1344	+
	1345	+ /* Update delta due to possible divisor change */
	1346	+ delta = maxrate / divisor - baud;
	1347	+ if (abs(delta) < baud / 50) {
	1348	+ lcr = serial_port_in(port, UART_LCR);
	1349	+ serial_port_out(port, UART_LCR, lcr \| 0x80);
	1350	+ serial_port_out(port, UART_DLL, divisor & 0xff);
	1351	+ serial_port_out(port, UART_DLM, divisor >> 8 & 0xff);
	1352	+ serial_port_out(port, 2, 16 - scr);
	1353	+ serial_port_out(port, UART_LCR, lcr);
	1354	+ return;
	1355	+ }
	1356	+ }
	1357	+}
1330	1358	static int pci_pericom_setup(struct serial_private *priv,
	1359	+ const struct pciserial_board *board,
	1360	+ struct uart_8250_port *port, int idx)
	1361	+{
	1362	+ unsigned int bar, offset = board->first_offset, maxnr;
	1363	+
	1364	+ bar = FL_GET_BASE(board->flags);
	1365	+ if (board->flags & FL_BASE_BARS)
	1366	+ bar += idx;
	1367	+ else
	1368	+ offset += idx * board->uart_offset;
	1369	+
	1370	+
	1371	+ maxnr = (pci_resource_len(priv->dev, bar) - board->first_offset) >>
	1372	+ (board->reg_shift + 3);
	1373	+
	1374	+ if (board->flags & FL_REGION_SZ_CAP && idx >= maxnr)
	1375	+ return 1;
	1376	+
	1377	+ port->port.set_divisor = pericom_do_set_divisor;
	1378	+
	1379	+ return setup_port(priv, port, bar, offset, board->reg_shift);
	1380	+}
	1381	+
	1382	+static int pci_pericom_setup_four_at_eight(struct serial_private *priv,
1331	1383	const struct pciserial_board *board,
1332	1384	struct uart_8250_port *port, int idx)
1333	1385	{
..	..	@@ -1347,6 +1399,8 @@
1347	1399
1348	1400	if (board->flags & FL_REGION_SZ_CAP && idx >= maxnr)
1349	1401	return 1;
	1402	+
	1403	+ port->port.set_divisor = pericom_do_set_divisor;
1350	1404
1351	1405	return setup_port(priv, port, bar, offset, board->reg_shift);
1352	1406	}
..	..	@@ -1453,7 +1507,7 @@
1453	1507	/* Get the io address from configuration space */
1454	1508	pci_read_config_word(pdev, config_base + 4, &iobase);
1455	1509
1456		- dev_dbg(&pdev->dev, "%s: idx=%d iobase=0x%x", __func__, idx, iobase);
	1510	+ pci_dbg(pdev, "idx=%d iobase=0x%x", idx, iobase);
1457	1511
1458	1512	port->port.iotype = UPIO_PORT;
1459	1513	port->port.iobase = iobase;
..	..	@@ -1477,7 +1531,6 @@
1477	1531	resource_size_t bar_data[3];
1478	1532	u8 config_base;
1479	1533	struct serial_private *priv = pci_get_drvdata(dev);
1480		- struct uart_8250_port *port;
1481	1534
1482	1535	if (!(pci_resource_flags(dev, 5) & IORESOURCE_IO) \|\|
1483	1536	!(pci_resource_flags(dev, 4) & IORESOURCE_IO) \|\|
..	..	@@ -1524,13 +1577,7 @@
1524	1577
1525	1578	pci_write_config_byte(dev, config_base + 0x06, dev->irq);
1526	1579
1527		- if (priv) {
1528		- /* re-apply RS232/485 mode when
1529		- * pciserial_resume_ports()
1530		- */
1531		- port = serial8250_get_port(priv->line[i]);
1532		- pci_fintek_rs485_config(&port->port, NULL);
1533		- } else {
	1580	+ if (!priv) {
1534	1581	/* First init without port data
1535	1582	* force init to RS232 Mode
1536	1583	*/
..	..	@@ -1541,12 +1588,83 @@
1541	1588	return max_port;
1542	1589	}
1543	1590
	1591	+static void f815xxa_mem_serial_out(struct uart_port *p, int offset, int value)
	1592	+{
	1593	+ struct f815xxa_data *data = p->private_data;
	1594	+ unsigned long flags;
	1595	+
	1596	+ spin_lock_irqsave(&data->lock, flags);
	1597	+ writeb(value, p->membase + offset);
	1598	+ readb(p->membase + UART_SCR); /* Dummy read for flush pcie tx queue */
	1599	+ spin_unlock_irqrestore(&data->lock, flags);
	1600	+}
	1601	+
	1602	+static int pci_fintek_f815xxa_setup(struct serial_private *priv,
	1603	+ const struct pciserial_board *board,
	1604	+ struct uart_8250_port *port, int idx)
	1605	+{
	1606	+ struct pci_dev *pdev = priv->dev;
	1607	+ struct f815xxa_data *data;
	1608	+
	1609	+ data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
	1610	+ if (!data)
	1611	+ return -ENOMEM;
	1612	+
	1613	+ data->idx = idx;
	1614	+ spin_lock_init(&data->lock);
	1615	+
	1616	+ port->port.private_data = data;
	1617	+ port->port.iotype = UPIO_MEM;
	1618	+ port->port.flags \|= UPF_IOREMAP;
	1619	+ port->port.mapbase = pci_resource_start(pdev, 0) + 8 * idx;
	1620	+ port->port.serial_out = f815xxa_mem_serial_out;
	1621	+
	1622	+ return 0;
	1623	+}
	1624	+
	1625	+static int pci_fintek_f815xxa_init(struct pci_dev *dev)
	1626	+{
	1627	+ u32 max_port, i;
	1628	+ int config_base;
	1629	+
	1630	+ if (!(pci_resource_flags(dev, 0) & IORESOURCE_MEM))
	1631	+ return -ENODEV;
	1632	+
	1633	+ switch (dev->device) {
	1634	+ case 0x1204: /* 4 ports */
	1635	+ case 0x1208: /* 8 ports */
	1636	+ max_port = dev->device & 0xff;
	1637	+ break;
	1638	+ case 0x1212: /* 12 ports */
	1639	+ max_port = 12;
	1640	+ break;
	1641	+ default:
	1642	+ return -EINVAL;
	1643	+ }
	1644	+
	1645	+ /* Set to mmio decode */
	1646	+ pci_write_config_byte(dev, 0x209, 0x40);
	1647	+
	1648	+ for (i = 0; i < max_port; ++i) {
	1649	+ /* UART0 configuration offset start from 0x2A0 */
	1650	+ config_base = 0x2A0 + 0x08 * i;
	1651	+
	1652	+ /* Select 128-byte FIFO and 8x FIFO threshold */
	1653	+ pci_write_config_byte(dev, config_base + 0x01, 0x33);
	1654	+
	1655	+ /* Enable UART I/O port */
	1656	+ pci_write_config_byte(dev, config_base + 0, 0x01);
	1657	+ }
	1658	+
	1659	+ return max_port;
	1660	+}
	1661	+
1544	1662	static int skip_tx_en_setup(struct serial_private *priv,
1545	1663	const struct pciserial_board *board,
1546	1664	struct uart_8250_port *port, int idx)
1547	1665	{
1548	1666	port->port.quirks \|= UPQ_NO_TXEN_TEST;
1549		- dev_dbg(&priv->dev->dev,
	1667	+ pci_dbg(priv->dev,
1550	1668	"serial8250: skipping TxEn test for device [%04x:%04x] subsystem [%04x:%04x]\n",
1551	1669	priv->dev->vendor, priv->dev->device,
1552	1670	priv->dev->subsystem_vendor, priv->dev->subsystem_device);
..	..	@@ -1637,6 +1755,79 @@
1637	1755	return pci_default_setup(priv, board, port, idx);
1638	1756	}
1639	1757
	1758	+
	1759	+#define CH384_XINT_ENABLE_REG 0xEB
	1760	+#define CH384_XINT_ENABLE_BIT 0x02
	1761	+
	1762	+static int pci_wch_ch38x_init(struct pci_dev *dev)
	1763	+{
	1764	+ int max_port;
	1765	+ unsigned long iobase;
	1766	+
	1767	+
	1768	+ switch (dev->device) {
	1769	+ case 0x3853: /* 8 ports */
	1770	+ max_port = 8;
	1771	+ break;
	1772	+ default:
	1773	+ return -EINVAL;
	1774	+ }
	1775	+
	1776	+ iobase = pci_resource_start(dev, 0);
	1777	+ outb(CH384_XINT_ENABLE_BIT, iobase + CH384_XINT_ENABLE_REG);
	1778	+
	1779	+ return max_port;
	1780	+}
	1781	+
	1782	+static void pci_wch_ch38x_exit(struct pci_dev *dev)
	1783	+{
	1784	+ unsigned long iobase;
	1785	+
	1786	+ iobase = pci_resource_start(dev, 0);
	1787	+ outb(0x0, iobase + CH384_XINT_ENABLE_REG);
	1788	+}
	1789	+
	1790	+
	1791	+static int
	1792	+pci_sunix_setup(struct serial_private *priv,
	1793	+ const struct pciserial_board *board,
	1794	+ struct uart_8250_port *port, int idx)
	1795	+{
	1796	+ int bar;
	1797	+ int offset;
	1798	+
	1799	+ port->port.flags \|= UPF_FIXED_TYPE;
	1800	+ port->port.type = PORT_SUNIX;
	1801	+
	1802	+ if (idx < 4) {
	1803	+ bar = 0;
	1804	+ offset = idx * board->uart_offset;
	1805	+ } else {
	1806	+ bar = 1;
	1807	+ idx -= 4;
	1808	+ idx = div_s64_rem(idx, 4, &offset);
	1809	+ offset = idx * 64 + offset * board->uart_offset;
	1810	+ }
	1811	+
	1812	+ return setup_port(priv, port, bar, offset, 0);
	1813	+}
	1814	+
	1815	+static int
	1816	+pci_moxa_setup(struct serial_private *priv,
	1817	+ const struct pciserial_board *board,
	1818	+ struct uart_8250_port *port, int idx)
	1819	+{
	1820	+ unsigned int bar = FL_GET_BASE(board->flags);
	1821	+ int offset;
	1822	+
	1823	+ if (board->num_ports == 4 && idx == 3)
	1824	+ offset = 7 * board->uart_offset;
	1825	+ else
	1826	+ offset = idx * board->uart_offset;
	1827	+
	1828	+ return setup_port(priv, port, bar, offset, 0);
	1829	+}
	1830	+
1640	1831	#define PCI_VENDOR_ID_SBSMODULARIO 0x124B
1641	1832	#define PCI_SUBVENDOR_ID_SBSMODULARIO 0x124B
1642	1833	#define PCI_DEVICE_ID_OCTPRO 0x0001
..	..	@@ -1688,6 +1879,7 @@
1688	1879	#define PCIE_VENDOR_ID_WCH 0x1c00
1689	1880	#define PCIE_DEVICE_ID_WCH_CH382_2S1P 0x3250
1690	1881	#define PCIE_DEVICE_ID_WCH_CH384_4S 0x3470
	1882	+#define PCIE_DEVICE_ID_WCH_CH384_8S 0x3853
1691	1883	#define PCIE_DEVICE_ID_WCH_CH382_2S 0x3253
1692	1884
1693	1885	#define PCI_VENDOR_ID_ACCESIO 0x494f
..	..	@@ -1726,6 +1918,18 @@
1726	1918	#define PCI_DEVICE_ID_ACCESIO_PCIE_ICM_4SM 0x11D8
1727	1919
1728	1920
	1921	+#define PCI_DEVICE_ID_MOXA_CP102E 0x1024
	1922	+#define PCI_DEVICE_ID_MOXA_CP102EL 0x1025
	1923	+#define PCI_DEVICE_ID_MOXA_CP104EL_A 0x1045
	1924	+#define PCI_DEVICE_ID_MOXA_CP114EL 0x1144
	1925	+#define PCI_DEVICE_ID_MOXA_CP116E_A_A 0x1160
	1926	+#define PCI_DEVICE_ID_MOXA_CP116E_A_B 0x1161
	1927	+#define PCI_DEVICE_ID_MOXA_CP118EL_A 0x1182
	1928	+#define PCI_DEVICE_ID_MOXA_CP118E_A_I 0x1183
	1929	+#define PCI_DEVICE_ID_MOXA_CP132EL 0x1322
	1930	+#define PCI_DEVICE_ID_MOXA_CP134EL_A 0x1342
	1931	+#define PCI_DEVICE_ID_MOXA_CP138E_A 0x1381
	1932	+#define PCI_DEVICE_ID_MOXA_CP168EL_A 0x1683
1729	1933
1730	1934	/* Unknown vendors/cards - this should not be in linux/pci_ids.h */
1731	1935	#define PCI_SUBDEVICE_ID_UNKNOWN_0x1584 0x1584
..	..	@@ -1770,6 +1974,16 @@
1770	1974	.subvendor = PCI_ANY_ID,
1771	1975	.subdevice = PCI_ANY_ID,
1772	1976	.init = pci_hp_diva_init,
	1977	+ .setup = pci_hp_diva_setup,
	1978	+ },
	1979	+ /*
	1980	+ * HPE PCI serial device
	1981	+ */
	1982	+ {
	1983	+ .vendor = PCI_VENDOR_ID_HP_3PAR,
	1984	+ .device = PCI_DEVICE_ID_HPE_PCI_SERIAL,
	1985	+ .subvendor = PCI_ANY_ID,
	1986	+ .subdevice = PCI_ANY_ID,
1773	1987	.setup = pci_hp_diva_setup,
1774	1988	},
1775	1989	/*
..	..	@@ -1989,7 +2203,7 @@
1989	2203	.device = PCI_DEVICE_ID_PERICOM_PI7C9X7954,
1990	2204	.subvendor = PCI_ANY_ID,
1991	2205	.subdevice = PCI_ANY_ID,
1992		- .setup = pci_pericom_setup,
	2206	+ .setup = pci_pericom_setup_four_at_eight,
1993	2207	},
1994	2208	/*
1995	2209	* PLX
..	..	@@ -2026,107 +2240,120 @@
2026	2240	.device = PCI_DEVICE_ID_ACCESIO_PCIE_COM_4SDB,
2027	2241	.subvendor = PCI_ANY_ID,
2028	2242	.subdevice = PCI_ANY_ID,
2029		- .setup = pci_pericom_setup,
	2243	+ .setup = pci_pericom_setup_four_at_eight,
2030	2244	},
2031	2245	{
2032	2246	.vendor = PCI_VENDOR_ID_ACCESIO,
2033	2247	.device = PCI_DEVICE_ID_ACCESIO_MPCIE_COM_4S,
2034	2248	.subvendor = PCI_ANY_ID,
2035	2249	.subdevice = PCI_ANY_ID,
2036		- .setup = pci_pericom_setup,
	2250	+ .setup = pci_pericom_setup_four_at_eight,
2037	2251	},
2038	2252	{
2039	2253	.vendor = PCI_VENDOR_ID_ACCESIO,
2040	2254	.device = PCI_DEVICE_ID_ACCESIO_PCIE_COM232_4DB,
2041	2255	.subvendor = PCI_ANY_ID,
2042	2256	.subdevice = PCI_ANY_ID,
2043		- .setup = pci_pericom_setup,
	2257	+ .setup = pci_pericom_setup_four_at_eight,
2044	2258	},
2045	2259	{
2046	2260	.vendor = PCI_VENDOR_ID_ACCESIO,
2047	2261	.device = PCI_DEVICE_ID_ACCESIO_MPCIE_COM232_4,
2048	2262	.subvendor = PCI_ANY_ID,
2049	2263	.subdevice = PCI_ANY_ID,
2050		- .setup = pci_pericom_setup,
	2264	+ .setup = pci_pericom_setup_four_at_eight,
2051	2265	},
2052	2266	{
2053	2267	.vendor = PCI_VENDOR_ID_ACCESIO,
2054	2268	.device = PCI_DEVICE_ID_ACCESIO_PCIE_COM_4SMDB,
2055	2269	.subvendor = PCI_ANY_ID,
2056	2270	.subdevice = PCI_ANY_ID,
2057		- .setup = pci_pericom_setup,
	2271	+ .setup = pci_pericom_setup_four_at_eight,
2058	2272	},
2059	2273	{
2060	2274	.vendor = PCI_VENDOR_ID_ACCESIO,
2061	2275	.device = PCI_DEVICE_ID_ACCESIO_MPCIE_COM_4SM,
2062	2276	.subvendor = PCI_ANY_ID,
2063	2277	.subdevice = PCI_ANY_ID,
2064		- .setup = pci_pericom_setup,
	2278	+ .setup = pci_pericom_setup_four_at_eight,
2065	2279	},
2066	2280	{
2067	2281	.vendor = PCI_VENDOR_ID_ACCESIO,
2068	2282	.device = PCI_DEVICE_ID_ACCESIO_MPCIE_ICM422_4,
2069	2283	.subvendor = PCI_ANY_ID,
2070	2284	.subdevice = PCI_ANY_ID,
2071		- .setup = pci_pericom_setup,
	2285	+ .setup = pci_pericom_setup_four_at_eight,
2072	2286	},
2073	2287	{
2074	2288	.vendor = PCI_VENDOR_ID_ACCESIO,
2075	2289	.device = PCI_DEVICE_ID_ACCESIO_MPCIE_ICM485_4,
2076	2290	.subvendor = PCI_ANY_ID,
2077	2291	.subdevice = PCI_ANY_ID,
2078		- .setup = pci_pericom_setup,
	2292	+ .setup = pci_pericom_setup_four_at_eight,
2079	2293	},
2080	2294	{
2081		- .vendor = PCI_DEVICE_ID_ACCESIO_PCIE_ICM_4S,
	2295	+ .vendor = PCI_VENDOR_ID_ACCESIO,
2082	2296	.device = PCI_DEVICE_ID_ACCESIO_PCIE_ICM232_4,
2083	2297	.subvendor = PCI_ANY_ID,
2084	2298	.subdevice = PCI_ANY_ID,
2085		- .setup = pci_pericom_setup,
	2299	+ .setup = pci_pericom_setup_four_at_eight,
	2300	+ },
	2301	+ {
	2302	+ .vendor = PCI_VENDOR_ID_ACCESIO,
	2303	+ .device = PCI_DEVICE_ID_ACCESIO_PCIE_ICM_4S,
	2304	+ .subvendor = PCI_ANY_ID,
	2305	+ .subdevice = PCI_ANY_ID,
	2306	+ .setup = pci_pericom_setup_four_at_eight,
2086	2307	},
2087	2308	{
2088	2309	.vendor = PCI_VENDOR_ID_ACCESIO,
2089	2310	.device = PCI_DEVICE_ID_ACCESIO_MPCIE_ICM232_4,
2090	2311	.subvendor = PCI_ANY_ID,
2091	2312	.subdevice = PCI_ANY_ID,
2092		- .setup = pci_pericom_setup,
	2313	+ .setup = pci_pericom_setup_four_at_eight,
2093	2314	},
2094	2315	{
2095	2316	.vendor = PCI_VENDOR_ID_ACCESIO,
2096	2317	.device = PCI_DEVICE_ID_ACCESIO_PCIE_COM422_4,
2097	2318	.subvendor = PCI_ANY_ID,
2098	2319	.subdevice = PCI_ANY_ID,
2099		- .setup = pci_pericom_setup,
	2320	+ .setup = pci_pericom_setup_four_at_eight,
2100	2321	},
2101	2322	{
2102	2323	.vendor = PCI_VENDOR_ID_ACCESIO,
2103	2324	.device = PCI_DEVICE_ID_ACCESIO_PCIE_COM485_4,
2104	2325	.subvendor = PCI_ANY_ID,
2105	2326	.subdevice = PCI_ANY_ID,
2106		- .setup = pci_pericom_setup,
	2327	+ .setup = pci_pericom_setup_four_at_eight,
2107	2328	},
2108	2329	{
2109	2330	.vendor = PCI_VENDOR_ID_ACCESIO,
2110	2331	.device = PCI_DEVICE_ID_ACCESIO_PCIE_COM232_4,
2111	2332	.subvendor = PCI_ANY_ID,
2112	2333	.subdevice = PCI_ANY_ID,
2113		- .setup = pci_pericom_setup,
	2334	+ .setup = pci_pericom_setup_four_at_eight,
2114	2335	},
2115	2336	{
2116	2337	.vendor = PCI_VENDOR_ID_ACCESIO,
2117	2338	.device = PCI_DEVICE_ID_ACCESIO_PCIE_COM_4SM,
2118	2339	.subvendor = PCI_ANY_ID,
2119	2340	.subdevice = PCI_ANY_ID,
2120		- .setup = pci_pericom_setup,
	2341	+ .setup = pci_pericom_setup_four_at_eight,
2121	2342	},
2122	2343	{
2123	2344	.vendor = PCI_VENDOR_ID_ACCESIO,
2124	2345	.device = PCI_DEVICE_ID_ACCESIO_PCIE_ICM_4SM,
2125	2346	.subvendor = PCI_ANY_ID,
2126	2347	.subdevice = PCI_ANY_ID,
2127		- .setup = pci_pericom_setup,
	2348	+ .setup = pci_pericom_setup_four_at_eight,
2128	2349	},
2129		- /*
	2350	+ {
	2351	+ .vendor = PCI_VENDOR_ID_ACCESIO,
	2352	+ .device = PCI_ANY_ID,
	2353	+ .subvendor = PCI_ANY_ID,
	2354	+ .subdevice = PCI_ANY_ID,
	2355	+ .setup = pci_pericom_setup,
	2356	+ }, /*
2130	2357	* SBS Technologies, Inc., PMC-OCTALPRO 232
2131	2358	*/
2132	2359	{
..	..	@@ -2222,21 +2449,14 @@
2222	2449	.setup = pci_timedia_setup,
2223	2450	},
2224	2451	/*
2225		- * SUNIX (Timedia) cards
2226		- * Do not "probe" for these cards as there is at least one combination
2227		- * card that should be handled by parport_pc that doesn't match the
2228		- * rule in pci_timedia_probe.
2229		- * It is part number is MIO5079A but its subdevice ID is 0x0102.
2230		- * There are some boards with part number SER5037AL that report
2231		- * subdevice ID 0x0002.
	2452	+ * Sunix PCI serial boards
2232	2453	*/
2233	2454	{
2234	2455	.vendor = PCI_VENDOR_ID_SUNIX,
2235	2456	.device = PCI_DEVICE_ID_SUNIX_1999,
2236	2457	.subvendor = PCI_VENDOR_ID_SUNIX,
2237	2458	.subdevice = PCI_ANY_ID,
2238		- .init = pci_timedia_init,
2239		- .setup = pci_timedia_setup,
	2459	+ .setup = pci_sunix_setup,
2240	2460	},
2241	2461	/*
2242	2462	* Xircom cards
..	..	@@ -2268,7 +2488,7 @@
2268	2488	.device = PCI_ANY_ID,
2269	2489	.subvendor = PCI_ANY_ID,
2270	2490	.subdevice = PCI_ANY_ID,
2271		- .init = pci_endrun_init,
	2491	+ .init = pci_oxsemi_tornado_init,
2272	2492	.setup = pci_default_setup,
2273	2493	},
2274	2494	/*
..	..	@@ -2452,6 +2672,16 @@
2452	2672	.subdevice = PCI_ANY_ID,
2453	2673	.setup = pci_wch_ch38x_setup,
2454	2674	},
	2675	+ /* WCH CH384 8S card (16850 clone) */
	2676	+ {
	2677	+ .vendor = PCIE_VENDOR_ID_WCH,
	2678	+ .device = PCIE_DEVICE_ID_WCH_CH384_8S,
	2679	+ .subvendor = PCI_ANY_ID,
	2680	+ .subdevice = PCI_ANY_ID,
	2681	+ .init = pci_wch_ch38x_init,
	2682	+ .exit = pci_wch_ch38x_exit,
	2683	+ .setup = pci_wch_ch38x_setup,
	2684	+ },
2455	2685	/*
2456	2686	* ASIX devices with FIFO bug
2457	2687	*/
..	..	@@ -2496,6 +2726,40 @@
2496	2726	.setup = pci_fintek_setup,
2497	2727	.init = pci_fintek_init,
2498	2728	},
	2729	+ /*
	2730	+ * MOXA
	2731	+ */
	2732	+ {
	2733	+ .vendor = PCI_VENDOR_ID_MOXA,
	2734	+ .device = PCI_ANY_ID,
	2735	+ .subvendor = PCI_ANY_ID,
	2736	+ .subdevice = PCI_ANY_ID,
	2737	+ .setup = pci_moxa_setup,
	2738	+ },
	2739	+ {
	2740	+ .vendor = 0x1c29,
	2741	+ .device = 0x1204,
	2742	+ .subvendor = PCI_ANY_ID,
	2743	+ .subdevice = PCI_ANY_ID,
	2744	+ .setup = pci_fintek_f815xxa_setup,
	2745	+ .init = pci_fintek_f815xxa_init,
	2746	+ },
	2747	+ {
	2748	+ .vendor = 0x1c29,
	2749	+ .device = 0x1208,
	2750	+ .subvendor = PCI_ANY_ID,
	2751	+ .subdevice = PCI_ANY_ID,
	2752	+ .setup = pci_fintek_f815xxa_setup,
	2753	+ .init = pci_fintek_f815xxa_init,
	2754	+ },
	2755	+ {
	2756	+ .vendor = 0x1c29,
	2757	+ .device = 0x1212,
	2758	+ .subvendor = PCI_ANY_ID,
	2759	+ .subdevice = PCI_ANY_ID,
	2760	+ .setup = pci_fintek_f815xxa_setup,
	2761	+ .init = pci_fintek_f815xxa_init,
	2762	+ },
2499	2763
2500	2764	/*
2501	2765	* Default "match everything" terminator entry
..	..	@@ -2525,15 +2789,6 @@
2525	2789	quirk_id_matches(quirk->subdevice, dev->subsystem_device))
2526	2790	break;
2527	2791	return quirk;
2528		-}
2529		-
2530		-static inline int get_pci_irq(struct pci_dev *dev,
2531		- const struct pciserial_board *board)
2532		-{
2533		- if (board->flags & FL_NOIRQ)
2534		- return 0;
2535		- else
2536		- return dev->irq;
2537	2792	}
2538	2793
2539	2794	/*
..	..	@@ -2578,7 +2833,7 @@
2578	2833	pbn_b0_2_1843200,
2579	2834	pbn_b0_4_1843200,
2580	2835
2581		- pbn_b0_1_4000000,
	2836	+ pbn_b0_1_3906250,
2582	2837
2583	2838	pbn_b0_bt_1_115200,
2584	2839	pbn_b0_bt_2_115200,
..	..	@@ -2656,12 +2911,11 @@
2656	2911	pbn_panacom2,
2657	2912	pbn_panacom4,
2658	2913	pbn_plx_romulus,
2659		- pbn_endrun_2_4000000,
2660	2914	pbn_oxsemi,
2661		- pbn_oxsemi_1_4000000,
2662		- pbn_oxsemi_2_4000000,
2663		- pbn_oxsemi_4_4000000,
2664		- pbn_oxsemi_8_4000000,
	2915	+ pbn_oxsemi_1_3906250,
	2916	+ pbn_oxsemi_2_3906250,
	2917	+ pbn_oxsemi_4_3906250,
	2918	+ pbn_oxsemi_8_3906250,
2665	2919	pbn_intel_i960,
2666	2920	pbn_sgi_ioc3,
2667	2921	pbn_computone_4,
..	..	@@ -2684,12 +2938,28 @@
2684	2938	pbn_fintek_4,
2685	2939	pbn_fintek_8,
2686	2940	pbn_fintek_12,
	2941	+ pbn_fintek_F81504A,
	2942	+ pbn_fintek_F81508A,
	2943	+ pbn_fintek_F81512A,
2687	2944	pbn_wch382_2,
2688	2945	pbn_wch384_4,
	2946	+ pbn_wch384_8,
2689	2947	pbn_pericom_PI7C9X7951,
2690	2948	pbn_pericom_PI7C9X7952,
2691	2949	pbn_pericom_PI7C9X7954,
2692	2950	pbn_pericom_PI7C9X7958,
	2951	+ pbn_sunix_pci_1s,
	2952	+ pbn_sunix_pci_2s,
	2953	+ pbn_sunix_pci_4s,
	2954	+ pbn_sunix_pci_8s,
	2955	+ pbn_sunix_pci_16s,
	2956	+ pbn_titan_1_4000000,
	2957	+ pbn_titan_2_4000000,
	2958	+ pbn_titan_4_4000000,
	2959	+ pbn_titan_8_4000000,
	2960	+ pbn_moxa8250_2p,
	2961	+ pbn_moxa8250_4p,
	2962	+ pbn_moxa8250_8p,
2693	2963	};
2694	2964
2695	2965	/*
..	..	@@ -2792,10 +3062,10 @@
2792	3062	.uart_offset = 8,
2793	3063	},
2794	3064
2795		- [pbn_b0_1_4000000] = {
	3065	+ [pbn_b0_1_3906250] = {
2796	3066	.flags = FL_BASE0,
2797	3067	.num_ports = 1,
2798		- .base_baud = 4000000,
	3068	+ .base_baud = 3906250,
2799	3069	.uart_offset = 8,
2800	3070	},
2801	3071
..	..	@@ -3167,20 +3437,6 @@
3167	3437	},
3168	3438
3169	3439	/*
3170		- * EndRun Technologies
3171		- * Uses the size of PCI Base region 0 to
3172		- * signal now many ports are available
3173		- * 2 port 952 Uart support
3174		- */
3175		- [pbn_endrun_2_4000000] = {
3176		- .flags = FL_BASE0,
3177		- .num_ports = 2,
3178		- .base_baud = 4000000,
3179		- .uart_offset = 0x200,
3180		- .first_offset = 0x1000,
3181		- },
3182		-
3183		- /*
3184	3440	* This board uses the size of PCI Base region 0 to
3185	3441	* signal now many ports are available
3186	3442	*/
..	..	@@ -3190,31 +3446,31 @@
3190	3446	.base_baud = 115200,
3191	3447	.uart_offset = 8,
3192	3448	},
3193		- [pbn_oxsemi_1_4000000] = {
	3449	+ [pbn_oxsemi_1_3906250] = {
3194	3450	.flags = FL_BASE0,
3195	3451	.num_ports = 1,
3196		- .base_baud = 4000000,
	3452	+ .base_baud = 3906250,
3197	3453	.uart_offset = 0x200,
3198	3454	.first_offset = 0x1000,
3199	3455	},
3200		- [pbn_oxsemi_2_4000000] = {
	3456	+ [pbn_oxsemi_2_3906250] = {
3201	3457	.flags = FL_BASE0,
3202	3458	.num_ports = 2,
3203		- .base_baud = 4000000,
	3459	+ .base_baud = 3906250,
3204	3460	.uart_offset = 0x200,
3205	3461	.first_offset = 0x1000,
3206	3462	},
3207		- [pbn_oxsemi_4_4000000] = {
	3463	+ [pbn_oxsemi_4_3906250] = {
3208	3464	.flags = FL_BASE0,
3209	3465	.num_ports = 4,
3210		- .base_baud = 4000000,
	3466	+ .base_baud = 3906250,
3211	3467	.uart_offset = 0x200,
3212	3468	.first_offset = 0x1000,
3213	3469	},
3214		- [pbn_oxsemi_8_4000000] = {
	3470	+ [pbn_oxsemi_8_3906250] = {
3215	3471	.flags = FL_BASE0,
3216	3472	.num_ports = 8,
3217		- .base_baud = 4000000,
	3473	+ .base_baud = 3906250,
3218	3474	.uart_offset = 0x200,
3219	3475	.first_offset = 0x1000,
3220	3476	},
..	..	@@ -3386,6 +3642,21 @@
3386	3642	.base_baud = 115200,
3387	3643	.first_offset = 0x40,
3388	3644	},
	3645	+ [pbn_fintek_F81504A] = {
	3646	+ .num_ports = 4,
	3647	+ .uart_offset = 8,
	3648	+ .base_baud = 115200,
	3649	+ },
	3650	+ [pbn_fintek_F81508A] = {
	3651	+ .num_ports = 8,
	3652	+ .uart_offset = 8,
	3653	+ .base_baud = 115200,
	3654	+ },
	3655	+ [pbn_fintek_F81512A] = {
	3656	+ .num_ports = 12,
	3657	+ .uart_offset = 8,
	3658	+ .base_baud = 115200,
	3659	+ },
3389	3660	[pbn_wch382_2] = {
3390	3661	.flags = FL_BASE0,
3391	3662	.num_ports = 2,
..	..	@@ -3399,6 +3670,13 @@
3399	3670	.base_baud = 115200,
3400	3671	.uart_offset = 8,
3401	3672	.first_offset = 0xC0,
	3673	+ },
	3674	+ [pbn_wch384_8] = {
	3675	+ .flags = FL_BASE0,
	3676	+ .num_ports = 8,
	3677	+ .base_baud = 115200,
	3678	+ .uart_offset = 8,
	3679	+ .first_offset = 0x00,
3402	3680	},
3403	3681	/*
3404	3682	* Pericom PI7C9X795[1248] Uno/Dual/Quad/Octal UART
..	..	@@ -3427,6 +3705,77 @@
3427	3705	.base_baud = 921600,
3428	3706	.uart_offset = 0x8,
3429	3707	},
	3708	+ [pbn_sunix_pci_1s] = {
	3709	+ .num_ports = 1,
	3710	+ .base_baud = 921600,
	3711	+ .uart_offset = 0x8,
	3712	+ },
	3713	+ [pbn_sunix_pci_2s] = {
	3714	+ .num_ports = 2,
	3715	+ .base_baud = 921600,
	3716	+ .uart_offset = 0x8,
	3717	+ },
	3718	+ [pbn_sunix_pci_4s] = {
	3719	+ .num_ports = 4,
	3720	+ .base_baud = 921600,
	3721	+ .uart_offset = 0x8,
	3722	+ },
	3723	+ [pbn_sunix_pci_8s] = {
	3724	+ .num_ports = 8,
	3725	+ .base_baud = 921600,
	3726	+ .uart_offset = 0x8,
	3727	+ },
	3728	+ [pbn_sunix_pci_16s] = {
	3729	+ .num_ports = 16,
	3730	+ .base_baud = 921600,
	3731	+ .uart_offset = 0x8,
	3732	+ },
	3733	+ [pbn_titan_1_4000000] = {
	3734	+ .flags = FL_BASE0,
	3735	+ .num_ports = 1,
	3736	+ .base_baud = 4000000,
	3737	+ .uart_offset = 0x200,
	3738	+ .first_offset = 0x1000,
	3739	+ },
	3740	+ [pbn_titan_2_4000000] = {
	3741	+ .flags = FL_BASE0,
	3742	+ .num_ports = 2,
	3743	+ .base_baud = 4000000,
	3744	+ .uart_offset = 0x200,
	3745	+ .first_offset = 0x1000,
	3746	+ },
	3747	+ [pbn_titan_4_4000000] = {
	3748	+ .flags = FL_BASE0,
	3749	+ .num_ports = 4,
	3750	+ .base_baud = 4000000,
	3751	+ .uart_offset = 0x200,
	3752	+ .first_offset = 0x1000,
	3753	+ },
	3754	+ [pbn_titan_8_4000000] = {
	3755	+ .flags = FL_BASE0,
	3756	+ .num_ports = 8,
	3757	+ .base_baud = 4000000,
	3758	+ .uart_offset = 0x200,
	3759	+ .first_offset = 0x1000,
	3760	+ },
	3761	+ [pbn_moxa8250_2p] = {
	3762	+ .flags = FL_BASE1,
	3763	+ .num_ports = 2,
	3764	+ .base_baud = 921600,
	3765	+ .uart_offset = 0x200,
	3766	+ },
	3767	+ [pbn_moxa8250_4p] = {
	3768	+ .flags = FL_BASE1,
	3769	+ .num_ports = 4,
	3770	+ .base_baud = 921600,
	3771	+ .uart_offset = 0x200,
	3772	+ },
	3773	+ [pbn_moxa8250_8p] = {
	3774	+ .flags = FL_BASE1,
	3775	+ .num_ports = 8,
	3776	+ .base_baud = 921600,
	3777	+ .uart_offset = 0x200,
	3778	+ },
3430	3779	};
3431	3780
3432	3781	static const struct pci_device_id blacklist[] = {
..	..	@@ -3439,20 +3788,6 @@
3439	3788	{ PCI_DEVICE(0x4348, 0x7053), }, /* WCH CH353 2S1P */
3440	3789	{ PCI_DEVICE(0x4348, 0x5053), }, /* WCH CH353 1S1P */
3441	3790	{ PCI_DEVICE(0x1c00, 0x3250), }, /* WCH CH382 2S1P */
3442		-
3443		- /* Moxa Smartio MUE boards handled by 8250_moxa */
3444		- { PCI_VDEVICE(MOXA, 0x1024), },
3445		- { PCI_VDEVICE(MOXA, 0x1025), },
3446		- { PCI_VDEVICE(MOXA, 0x1045), },
3447		- { PCI_VDEVICE(MOXA, 0x1144), },
3448		- { PCI_VDEVICE(MOXA, 0x1160), },
3449		- { PCI_VDEVICE(MOXA, 0x1161), },
3450		- { PCI_VDEVICE(MOXA, 0x1182), },
3451		- { PCI_VDEVICE(MOXA, 0x1183), },
3452		- { PCI_VDEVICE(MOXA, 0x1322), },
3453		- { PCI_VDEVICE(MOXA, 0x1342), },
3454		- { PCI_VDEVICE(MOXA, 0x1381), },
3455		- { PCI_VDEVICE(MOXA, 0x1683), },
3456	3791
3457	3792	/* Intel platforms with MID UART */
3458	3793	{ PCI_VDEVICE(INTEL, 0x081b), },
..	..	@@ -3468,12 +3803,21 @@
3468	3803	{ PCI_VDEVICE(INTEL, 0x0f0c), },
3469	3804	{ PCI_VDEVICE(INTEL, 0x228a), },
3470	3805	{ PCI_VDEVICE(INTEL, 0x228c), },
	3806	+ { PCI_VDEVICE(INTEL, 0x4b96), },
	3807	+ { PCI_VDEVICE(INTEL, 0x4b97), },
	3808	+ { PCI_VDEVICE(INTEL, 0x4b98), },
	3809	+ { PCI_VDEVICE(INTEL, 0x4b99), },
	3810	+ { PCI_VDEVICE(INTEL, 0x4b9a), },
	3811	+ { PCI_VDEVICE(INTEL, 0x4b9b), },
3471	3812	{ PCI_VDEVICE(INTEL, 0x9ce3), },
3472	3813	{ PCI_VDEVICE(INTEL, 0x9ce4), },
3473	3814
3474	3815	/* Exar devices */
3475	3816	{ PCI_VDEVICE(EXAR, PCI_ANY_ID), },
3476	3817	{ PCI_VDEVICE(COMMTECH, PCI_ANY_ID), },
	3818	+
	3819	+ /* End of the black list */
	3820	+ { }
3477	3821	};
3478	3822
3479	3823	static int serial_pci_is_class_communication(struct pci_dev *dev)
..	..	@@ -3487,25 +3831,6 @@
3487	3831	((dev->class >> 8) != PCI_CLASS_COMMUNICATION_MODEM)) \|\|
3488	3832	(dev->class & 0xff) > 6)
3489	3833	return -ENODEV;
3490		-
3491		- return 0;
3492		-}
3493		-
3494		-static int serial_pci_is_blacklisted(struct pci_dev *dev)
3495		-{
3496		- const struct pci_device_id *bldev;
3497		-
3498		- /*
3499		- * Do not access blacklisted devices that are known not to
3500		- * feature serial ports or are handled by other modules.
3501		- */
3502		- for (bldev = blacklist;
3503		- bldev < blacklist + ARRAY_SIZE(blacklist);
3504		- bldev++) {
3505		- if (dev->vendor == bldev->vendor &&
3506		- dev->device == bldev->device)
3507		- return -ENODEV;
3508		- }
3509	3834
3510	3835	return 0;
3511	3836	}
..	..	@@ -3532,7 +3857,7 @@
3532	3857	return -ENODEV;
3533	3858
3534	3859	num_iomem = num_port = 0;
3535		- for (i = 0; i < PCI_NUM_BAR_RESOURCES; i++) {
	3860	+ for (i = 0; i < PCI_STD_NUM_BARS; i++) {
3536	3861	if (pci_resource_flags(dev, i) & IORESOURCE_IO) {
3537	3862	num_port++;
3538	3863	if (first_port == -1)
..	..	@@ -3560,7 +3885,7 @@
3560	3885	*/
3561	3886	first_port = -1;
3562	3887	num_port = 0;
3563		- for (i = 0; i < PCI_NUM_BAR_RESOURCES; i++) {
	3888	+ for (i = 0; i < PCI_STD_NUM_BARS; i++) {
3564	3889	if (pci_resource_flags(dev, i) & IORESOURCE_IO &&
3565	3890	pci_resource_len(dev, i) == 8 &&
3566	3891	(first_port == -1 \|\| (first_port + num_port) == i)) {
..	..	@@ -3637,19 +3962,40 @@
3637	3962	memset(&uart, 0, sizeof(uart));
3638	3963	uart.port.flags = UPF_SKIP_TEST \| UPF_BOOT_AUTOCONF \| UPF_SHARE_IRQ;
3639	3964	uart.port.uartclk = board->base_baud * 16;
3640		- uart.port.irq = get_pci_irq(dev, board);
	3965	+
	3966	+ if (board->flags & FL_NOIRQ) {
	3967	+ uart.port.irq = 0;
	3968	+ } else {
	3969	+ if (pci_match_id(pci_use_msi, dev)) {
	3970	+ pci_dbg(dev, "Using MSI(-X) interrupts\n");
	3971	+ pci_set_master(dev);
	3972	+ uart.port.flags &= ~UPF_SHARE_IRQ;
	3973	+ rc = pci_alloc_irq_vectors(dev, 1, 1, PCI_IRQ_ALL_TYPES);
	3974	+ } else {
	3975	+ pci_dbg(dev, "Using legacy interrupts\n");
	3976	+ rc = pci_alloc_irq_vectors(dev, 1, 1, PCI_IRQ_LEGACY);
	3977	+ }
	3978	+ if (rc < 0) {
	3979	+ kfree(priv);
	3980	+ priv = ERR_PTR(rc);
	3981	+ goto err_deinit;
	3982	+ }
	3983	+
	3984	+ uart.port.irq = pci_irq_vector(dev, 0);
	3985	+ }
	3986	+
3641	3987	uart.port.dev = &dev->dev;
3642	3988
3643	3989	for (i = 0; i < nr_ports; i++) {
3644	3990	if (quirk->setup(priv, board, &uart, i))
3645	3991	break;
3646	3992
3647		- dev_dbg(&dev->dev, "Setup PCI port: port %lx, irq %d, type %d\n",
	3993	+ pci_dbg(dev, "Setup PCI port: port %lx, irq %d, type %d\n",
3648	3994	uart.port.iobase, uart.port.irq, uart.port.iotype);
3649	3995
3650	3996	priv->line[i] = serial8250_register_8250_port(&uart);
3651	3997	if (priv->line[i] < 0) {
3652		- dev_err(&dev->dev,
	3998	+ pci_err(dev,
3653	3999	"Couldn't register serial port %lx, irq %d, type %d, error %d\n",
3654	4000	uart.port.iobase, uart.port.irq,
3655	4001	uart.port.iotype, priv->line[i]);
..	..	@@ -3733,6 +4079,7 @@
3733	4079	struct pci_serial_quirk *quirk;
3734	4080	struct serial_private *priv;
3735	4081	const struct pciserial_board *board;
	4082	+ const struct pci_device_id *exclude;
3736	4083	struct pciserial_board tmp;
3737	4084	int rc;
3738	4085
..	..	@@ -3744,16 +4091,15 @@
3744	4091	}
3745	4092
3746	4093	if (ent->driver_data >= ARRAY_SIZE(pci_boards)) {
3747		- dev_err(&dev->dev, "invalid driver_data: %ld\n",
3748		- ent->driver_data);
	4094	+ pci_err(dev, "invalid driver_data: %ld\n", ent->driver_data);
3749	4095	return -EINVAL;
3750	4096	}
3751	4097
3752	4098	board = &pci_boards[ent->driver_data];
3753	4099
3754		- rc = serial_pci_is_blacklisted(dev);
3755		- if (rc)
3756		- return rc;
	4100	+ exclude = pci_match_id(blacklist, dev);
	4101	+ if (exclude)
	4102	+ return -ENODEV;
3757	4103
3758	4104	rc = pcim_enable_device(dev);
3759	4105	pci_save_state(dev);
..	..	@@ -3807,8 +4153,7 @@
3807	4153	#ifdef CONFIG_PM_SLEEP
3808	4154	static int pciserial_suspend_one(struct device *dev)
3809	4155	{
3810		- struct pci_dev *pdev = to_pci_dev(dev);
3811		- struct serial_private *priv = pci_get_drvdata(pdev);
	4156	+ struct serial_private *priv = dev_get_drvdata(dev);
3812	4157
3813	4158	if (priv)
3814	4159	pciserial_suspend_ports(priv);
..	..	@@ -3829,7 +4174,7 @@
3829	4174	err = pci_enable_device(pdev);
3830	4175	/* FIXME: We cannot simply error out here */
3831	4176	if (err)
3832		- dev_err(dev, "Unable to re-enable ports, trying to continue.\n");
	4177	+ pci_err(pdev, "Unable to re-enable ports, trying to continue.\n");
3833	4178	pciserial_resume_ports(priv);
3834	4179	}
3835	4180	return 0;
..	..	@@ -4023,13 +4368,6 @@
4023	4368	0x10b5, 0x106a, 0, 0,
4024	4369	pbn_plx_romulus },
4025	4370	/*
4026		- * EndRun Technologies. PCI express device range.
4027		- * EndRun PTP/1588 has 2 Native UARTs.
4028		- */
4029		- { PCI_VENDOR_ID_ENDRUN, PCI_DEVICE_ID_ENDRUN_1588,
4030		- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4031		- pbn_endrun_2_4000000 },
4032		- /*
4033	4371	* Quatech cards. These actually have configurable clocks but for
4034	4372	* now we just use the default.
4035	4373	*
..	..	@@ -4138,158 +4476,165 @@
4138	4476	*/
4139	4477	{ PCI_VENDOR_ID_OXSEMI, 0xc101, /* OXPCIe952 1 Legacy UART */
4140	4478	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4141		- pbn_b0_1_4000000 },
	4479	+ pbn_b0_1_3906250 },
4142	4480	{ PCI_VENDOR_ID_OXSEMI, 0xc105, /* OXPCIe952 1 Legacy UART */
4143	4481	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4144		- pbn_b0_1_4000000 },
	4482	+ pbn_b0_1_3906250 },
4145	4483	{ PCI_VENDOR_ID_OXSEMI, 0xc11b, /* OXPCIe952 1 Native UART */
4146	4484	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4147		- pbn_oxsemi_1_4000000 },
	4485	+ pbn_oxsemi_1_3906250 },
4148	4486	{ PCI_VENDOR_ID_OXSEMI, 0xc11f, /* OXPCIe952 1 Native UART */
4149	4487	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4150		- pbn_oxsemi_1_4000000 },
	4488	+ pbn_oxsemi_1_3906250 },
4151	4489	{ PCI_VENDOR_ID_OXSEMI, 0xc120, /* OXPCIe952 1 Legacy UART */
4152	4490	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4153		- pbn_b0_1_4000000 },
	4491	+ pbn_b0_1_3906250 },
4154	4492	{ PCI_VENDOR_ID_OXSEMI, 0xc124, /* OXPCIe952 1 Legacy UART */
4155	4493	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4156		- pbn_b0_1_4000000 },
	4494	+ pbn_b0_1_3906250 },
4157	4495	{ PCI_VENDOR_ID_OXSEMI, 0xc138, /* OXPCIe952 1 Native UART */
4158	4496	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4159		- pbn_oxsemi_1_4000000 },
	4497	+ pbn_oxsemi_1_3906250 },
4160	4498	{ PCI_VENDOR_ID_OXSEMI, 0xc13d, /* OXPCIe952 1 Native UART */
4161	4499	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4162		- pbn_oxsemi_1_4000000 },
	4500	+ pbn_oxsemi_1_3906250 },
4163	4501	{ PCI_VENDOR_ID_OXSEMI, 0xc140, /* OXPCIe952 1 Legacy UART */
4164	4502	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4165		- pbn_b0_1_4000000 },
	4503	+ pbn_b0_1_3906250 },
4166	4504	{ PCI_VENDOR_ID_OXSEMI, 0xc141, /* OXPCIe952 1 Legacy UART */
4167	4505	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4168		- pbn_b0_1_4000000 },
	4506	+ pbn_b0_1_3906250 },
4169	4507	{ PCI_VENDOR_ID_OXSEMI, 0xc144, /* OXPCIe952 1 Legacy UART */
4170	4508	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4171		- pbn_b0_1_4000000 },
	4509	+ pbn_b0_1_3906250 },
4172	4510	{ PCI_VENDOR_ID_OXSEMI, 0xc145, /* OXPCIe952 1 Legacy UART */
4173	4511	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4174		- pbn_b0_1_4000000 },
	4512	+ pbn_b0_1_3906250 },
4175	4513	{ PCI_VENDOR_ID_OXSEMI, 0xc158, /* OXPCIe952 2 Native UART */
4176	4514	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4177		- pbn_oxsemi_2_4000000 },
	4515	+ pbn_oxsemi_2_3906250 },
4178	4516	{ PCI_VENDOR_ID_OXSEMI, 0xc15d, /* OXPCIe952 2 Native UART */
4179	4517	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4180		- pbn_oxsemi_2_4000000 },
	4518	+ pbn_oxsemi_2_3906250 },
4181	4519	{ PCI_VENDOR_ID_OXSEMI, 0xc208, /* OXPCIe954 4 Native UART */
4182	4520	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4183		- pbn_oxsemi_4_4000000 },
	4521	+ pbn_oxsemi_4_3906250 },
4184	4522	{ PCI_VENDOR_ID_OXSEMI, 0xc20d, /* OXPCIe954 4 Native UART */
4185	4523	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4186		- pbn_oxsemi_4_4000000 },
	4524	+ pbn_oxsemi_4_3906250 },
4187	4525	{ PCI_VENDOR_ID_OXSEMI, 0xc308, /* OXPCIe958 8 Native UART */
4188	4526	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4189		- pbn_oxsemi_8_4000000 },
	4527	+ pbn_oxsemi_8_3906250 },
4190	4528	{ PCI_VENDOR_ID_OXSEMI, 0xc30d, /* OXPCIe958 8 Native UART */
4191	4529	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4192		- pbn_oxsemi_8_4000000 },
	4530	+ pbn_oxsemi_8_3906250 },
4193	4531	{ PCI_VENDOR_ID_OXSEMI, 0xc40b, /* OXPCIe200 1 Native UART */
4194	4532	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4195		- pbn_oxsemi_1_4000000 },
	4533	+ pbn_oxsemi_1_3906250 },
4196	4534	{ PCI_VENDOR_ID_OXSEMI, 0xc40f, /* OXPCIe200 1 Native UART */
4197	4535	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4198		- pbn_oxsemi_1_4000000 },
	4536	+ pbn_oxsemi_1_3906250 },
4199	4537	{ PCI_VENDOR_ID_OXSEMI, 0xc41b, /* OXPCIe200 1 Native UART */
4200	4538	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4201		- pbn_oxsemi_1_4000000 },
	4539	+ pbn_oxsemi_1_3906250 },
4202	4540	{ PCI_VENDOR_ID_OXSEMI, 0xc41f, /* OXPCIe200 1 Native UART */
4203	4541	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4204		- pbn_oxsemi_1_4000000 },
	4542	+ pbn_oxsemi_1_3906250 },
4205	4543	{ PCI_VENDOR_ID_OXSEMI, 0xc42b, /* OXPCIe200 1 Native UART */
4206	4544	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4207		- pbn_oxsemi_1_4000000 },
	4545	+ pbn_oxsemi_1_3906250 },
4208	4546	{ PCI_VENDOR_ID_OXSEMI, 0xc42f, /* OXPCIe200 1 Native UART */
4209	4547	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4210		- pbn_oxsemi_1_4000000 },
	4548	+ pbn_oxsemi_1_3906250 },
4211	4549	{ PCI_VENDOR_ID_OXSEMI, 0xc43b, /* OXPCIe200 1 Native UART */
4212	4550	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4213		- pbn_oxsemi_1_4000000 },
	4551	+ pbn_oxsemi_1_3906250 },
4214	4552	{ PCI_VENDOR_ID_OXSEMI, 0xc43f, /* OXPCIe200 1 Native UART */
4215	4553	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4216		- pbn_oxsemi_1_4000000 },
	4554	+ pbn_oxsemi_1_3906250 },
4217	4555	{ PCI_VENDOR_ID_OXSEMI, 0xc44b, /* OXPCIe200 1 Native UART */
4218	4556	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4219		- pbn_oxsemi_1_4000000 },
	4557	+ pbn_oxsemi_1_3906250 },
4220	4558	{ PCI_VENDOR_ID_OXSEMI, 0xc44f, /* OXPCIe200 1 Native UART */
4221	4559	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4222		- pbn_oxsemi_1_4000000 },
	4560	+ pbn_oxsemi_1_3906250 },
4223	4561	{ PCI_VENDOR_ID_OXSEMI, 0xc45b, /* OXPCIe200 1 Native UART */
4224	4562	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4225		- pbn_oxsemi_1_4000000 },
	4563	+ pbn_oxsemi_1_3906250 },
4226	4564	{ PCI_VENDOR_ID_OXSEMI, 0xc45f, /* OXPCIe200 1 Native UART */
4227	4565	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4228		- pbn_oxsemi_1_4000000 },
	4566	+ pbn_oxsemi_1_3906250 },
4229	4567	{ PCI_VENDOR_ID_OXSEMI, 0xc46b, /* OXPCIe200 1 Native UART */
4230	4568	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4231		- pbn_oxsemi_1_4000000 },
	4569	+ pbn_oxsemi_1_3906250 },
4232	4570	{ PCI_VENDOR_ID_OXSEMI, 0xc46f, /* OXPCIe200 1 Native UART */
4233	4571	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4234		- pbn_oxsemi_1_4000000 },
	4572	+ pbn_oxsemi_1_3906250 },
4235	4573	{ PCI_VENDOR_ID_OXSEMI, 0xc47b, /* OXPCIe200 1 Native UART */
4236	4574	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4237		- pbn_oxsemi_1_4000000 },
	4575	+ pbn_oxsemi_1_3906250 },
4238	4576	{ PCI_VENDOR_ID_OXSEMI, 0xc47f, /* OXPCIe200 1 Native UART */
4239	4577	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4240		- pbn_oxsemi_1_4000000 },
	4578	+ pbn_oxsemi_1_3906250 },
4241	4579	{ PCI_VENDOR_ID_OXSEMI, 0xc48b, /* OXPCIe200 1 Native UART */
4242	4580	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4243		- pbn_oxsemi_1_4000000 },
	4581	+ pbn_oxsemi_1_3906250 },
4244	4582	{ PCI_VENDOR_ID_OXSEMI, 0xc48f, /* OXPCIe200 1 Native UART */
4245	4583	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4246		- pbn_oxsemi_1_4000000 },
	4584	+ pbn_oxsemi_1_3906250 },
4247	4585	{ PCI_VENDOR_ID_OXSEMI, 0xc49b, /* OXPCIe200 1 Native UART */
4248	4586	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4249		- pbn_oxsemi_1_4000000 },
	4587	+ pbn_oxsemi_1_3906250 },
4250	4588	{ PCI_VENDOR_ID_OXSEMI, 0xc49f, /* OXPCIe200 1 Native UART */
4251	4589	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4252		- pbn_oxsemi_1_4000000 },
	4590	+ pbn_oxsemi_1_3906250 },
4253	4591	{ PCI_VENDOR_ID_OXSEMI, 0xc4ab, /* OXPCIe200 1 Native UART */
4254	4592	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4255		- pbn_oxsemi_1_4000000 },
	4593	+ pbn_oxsemi_1_3906250 },
4256	4594	{ PCI_VENDOR_ID_OXSEMI, 0xc4af, /* OXPCIe200 1 Native UART */
4257	4595	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4258		- pbn_oxsemi_1_4000000 },
	4596	+ pbn_oxsemi_1_3906250 },
4259	4597	{ PCI_VENDOR_ID_OXSEMI, 0xc4bb, /* OXPCIe200 1 Native UART */
4260	4598	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4261		- pbn_oxsemi_1_4000000 },
	4599	+ pbn_oxsemi_1_3906250 },
4262	4600	{ PCI_VENDOR_ID_OXSEMI, 0xc4bf, /* OXPCIe200 1 Native UART */
4263	4601	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4264		- pbn_oxsemi_1_4000000 },
	4602	+ pbn_oxsemi_1_3906250 },
4265	4603	{ PCI_VENDOR_ID_OXSEMI, 0xc4cb, /* OXPCIe200 1 Native UART */
4266	4604	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4267		- pbn_oxsemi_1_4000000 },
	4605	+ pbn_oxsemi_1_3906250 },
4268	4606	{ PCI_VENDOR_ID_OXSEMI, 0xc4cf, /* OXPCIe200 1 Native UART */
4269	4607	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4270		- pbn_oxsemi_1_4000000 },
	4608	+ pbn_oxsemi_1_3906250 },
4271	4609	/*
4272	4610	* Mainpine Inc. IQ Express "Rev3" utilizing OxSemi Tornado
4273	4611	*/
4274	4612	{ PCI_VENDOR_ID_MAINPINE, 0x4000, /* IQ Express 1 Port V.34 Super-G3 Fax */
4275	4613	PCI_VENDOR_ID_MAINPINE, 0x4001, 0, 0,
4276		- pbn_oxsemi_1_4000000 },
	4614	+ pbn_oxsemi_1_3906250 },
4277	4615	{ PCI_VENDOR_ID_MAINPINE, 0x4000, /* IQ Express 2 Port V.34 Super-G3 Fax */
4278	4616	PCI_VENDOR_ID_MAINPINE, 0x4002, 0, 0,
4279		- pbn_oxsemi_2_4000000 },
	4617	+ pbn_oxsemi_2_3906250 },
4280	4618	{ PCI_VENDOR_ID_MAINPINE, 0x4000, /* IQ Express 4 Port V.34 Super-G3 Fax */
4281	4619	PCI_VENDOR_ID_MAINPINE, 0x4004, 0, 0,
4282		- pbn_oxsemi_4_4000000 },
	4620	+ pbn_oxsemi_4_3906250 },
4283	4621	{ PCI_VENDOR_ID_MAINPINE, 0x4000, /* IQ Express 8 Port V.34 Super-G3 Fax */
4284	4622	PCI_VENDOR_ID_MAINPINE, 0x4008, 0, 0,
4285		- pbn_oxsemi_8_4000000 },
	4623	+ pbn_oxsemi_8_3906250 },
4286	4624
4287	4625	/*
4288	4626	* Digi/IBM PCIe 2-port Async EIA-232 Adapter utilizing OxSemi Tornado
4289	4627	*/
4290	4628	{ PCI_VENDOR_ID_DIGI, PCIE_DEVICE_ID_NEO_2_OX_IBM,
4291	4629	PCI_SUBVENDOR_ID_IBM, PCI_ANY_ID, 0, 0,
4292		- pbn_oxsemi_2_4000000 },
	4630	+ pbn_oxsemi_2_3906250 },
	4631	+ /*
	4632	+ * EndRun Technologies. PCI express device range.
	4633	+ * EndRun PTP/1588 has 2 Native UARTs utilizing OxSemi 952.
	4634	+ */
	4635	+ { PCI_VENDOR_ID_ENDRUN, PCI_DEVICE_ID_ENDRUN_1588,
	4636	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	4637	+ pbn_oxsemi_2_3906250 },
4293	4638
4294	4639	/*
4295	4640	* SBS Technologies, Inc. P-Octal and PMC-OCTPRO cards,
..	..	@@ -4363,22 +4708,22 @@
4363	4708	pbn_b0_4_921600 },
4364	4709	{ PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_100E,
4365	4710	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4366		- pbn_oxsemi_1_4000000 },
	4711	+ pbn_titan_1_4000000 },
4367	4712	{ PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200E,
4368	4713	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4369		- pbn_oxsemi_2_4000000 },
	4714	+ pbn_titan_2_4000000 },
4370	4715	{ PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_400E,
4371	4716	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4372		- pbn_oxsemi_4_4000000 },
	4717	+ pbn_titan_4_4000000 },
4373	4718	{ PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800E,
4374	4719	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4375		- pbn_oxsemi_8_4000000 },
	4720	+ pbn_titan_8_4000000 },
4376	4721	{ PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200EI,
4377	4722	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4378		- pbn_oxsemi_2_4000000 },
	4723	+ pbn_titan_2_4000000 },
4379	4724	{ PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200EISI,
4380	4725	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4381		- pbn_oxsemi_2_4000000 },
	4726	+ pbn_titan_2_4000000 },
4382	4727	{ PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200V3,
4383	4728	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4384	4729	pbn_b0_bt_2_921600 },
..	..	@@ -4480,17 +4825,29 @@
4480	4825	pbn_b0_bt_1_921600 },
4481	4826
4482	4827	/*
4483		- * SUNIX (TIMEDIA)
	4828	+ * Sunix PCI serial boards
4484	4829	*/
4485	4830	{ PCI_VENDOR_ID_SUNIX, PCI_DEVICE_ID_SUNIX_1999,
4486		- PCI_VENDOR_ID_SUNIX, PCI_ANY_ID,
4487		- PCI_CLASS_COMMUNICATION_SERIAL << 8, 0xffff00,
4488		- pbn_b0_bt_1_921600 },
4489		-
	4831	+ PCI_VENDOR_ID_SUNIX, 0x0001, 0, 0,
	4832	+ pbn_sunix_pci_1s },
4490	4833	{ PCI_VENDOR_ID_SUNIX, PCI_DEVICE_ID_SUNIX_1999,
4491		- PCI_VENDOR_ID_SUNIX, PCI_ANY_ID,
4492		- PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, 0xffff00,
4493		- pbn_b0_bt_1_921600 },
	4834	+ PCI_VENDOR_ID_SUNIX, 0x0002, 0, 0,
	4835	+ pbn_sunix_pci_2s },
	4836	+ { PCI_VENDOR_ID_SUNIX, PCI_DEVICE_ID_SUNIX_1999,
	4837	+ PCI_VENDOR_ID_SUNIX, 0x0004, 0, 0,
	4838	+ pbn_sunix_pci_4s },
	4839	+ { PCI_VENDOR_ID_SUNIX, PCI_DEVICE_ID_SUNIX_1999,
	4840	+ PCI_VENDOR_ID_SUNIX, 0x0084, 0, 0,
	4841	+ pbn_sunix_pci_4s },
	4842	+ { PCI_VENDOR_ID_SUNIX, PCI_DEVICE_ID_SUNIX_1999,
	4843	+ PCI_VENDOR_ID_SUNIX, 0x0008, 0, 0,
	4844	+ pbn_sunix_pci_8s },
	4845	+ { PCI_VENDOR_ID_SUNIX, PCI_DEVICE_ID_SUNIX_1999,
	4846	+ PCI_VENDOR_ID_SUNIX, 0x0088, 0, 0,
	4847	+ pbn_sunix_pci_8s },
	4848	+ { PCI_VENDOR_ID_SUNIX, PCI_DEVICE_ID_SUNIX_1999,
	4849	+ PCI_VENDOR_ID_SUNIX, 0x0010, 0, 0,
	4850	+ pbn_sunix_pci_16s },
4494	4851
4495	4852	/*
4496	4853	* AFAVLAB serial card, from Harald Welte <laforge@gnumonks.org>
..	..	@@ -4640,6 +4997,10 @@
4640	4997	{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_DIVA_AUX,
4641	4998	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
4642	4999	pbn_b2_1_115200 },
	5000	+ /* HPE PCI serial device */
	5001	+ { PCI_VENDOR_ID_HP_3PAR, PCI_DEVICE_ID_HPE_PCI_SERIAL,
	5002	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	5003	+ pbn_b1_1_115200 },
4643	5004
4644	5005	{ PCI_VENDOR_ID_DCI, PCI_DEVICE_ID_DCI_PCCOM2,
4645	5006	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
..	..	@@ -5110,6 +5471,46 @@
5110	5471	pbn_ni8430_4 },
5111	5472
5112	5473	/*
	5474	+ * MOXA
	5475	+ */
	5476	+ { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP102E,
	5477	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	5478	+ pbn_moxa8250_2p },
	5479	+ { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP102EL,
	5480	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	5481	+ pbn_moxa8250_2p },
	5482	+ { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP104EL_A,
	5483	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	5484	+ pbn_moxa8250_4p },
	5485	+ { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP114EL,
	5486	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	5487	+ pbn_moxa8250_4p },
	5488	+ { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP116E_A_A,
	5489	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	5490	+ pbn_moxa8250_8p },
	5491	+ { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP116E_A_B,
	5492	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	5493	+ pbn_moxa8250_8p },
	5494	+ { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP118EL_A,
	5495	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	5496	+ pbn_moxa8250_8p },
	5497	+ { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP118E_A_I,
	5498	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	5499	+ pbn_moxa8250_8p },
	5500	+ { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP132EL,
	5501	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	5502	+ pbn_moxa8250_2p },
	5503	+ { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP134EL_A,
	5504	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	5505	+ pbn_moxa8250_4p },
	5506	+ { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP138E_A,
	5507	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	5508	+ pbn_moxa8250_8p },
	5509	+ { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP168EL_A,
	5510	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	5511	+ pbn_moxa8250_8p },
	5512	+
	5513	+ /*
5113	5514	* ADDI-DATA GmbH communication cards <info@addi-data.com>
5114	5515	*/
5115	5516	{ PCI_VENDOR_ID_ADDIDATA,
..	..	@@ -5332,6 +5733,9 @@
5332	5733	PCI_ANY_ID, PCI_ANY_ID,
5333	5734	0, 0, pbn_wch384_4 },
5334	5735
	5736	+ { PCIE_VENDOR_ID_WCH, PCIE_DEVICE_ID_WCH_CH384_8S,
	5737	+ PCI_ANY_ID, PCI_ANY_ID,
	5738	+ 0, 0, pbn_wch384_8 },
5335	5739	/*
5336	5740	* Realtek RealManage
5337	5741	*/
..	..	@@ -5347,6 +5751,9 @@
5347	5751	{ PCI_DEVICE(0x1c29, 0x1104), .driver_data = pbn_fintek_4 },
5348	5752	{ PCI_DEVICE(0x1c29, 0x1108), .driver_data = pbn_fintek_8 },
5349	5753	{ PCI_DEVICE(0x1c29, 0x1112), .driver_data = pbn_fintek_12 },
	5754	+ { PCI_DEVICE(0x1c29, 0x1204), .driver_data = pbn_fintek_F81504A },
	5755	+ { PCI_DEVICE(0x1c29, 0x1208), .driver_data = pbn_fintek_F81508A },
	5756	+ { PCI_DEVICE(0x1c29, 0x1212), .driver_data = pbn_fintek_F81512A },
5350	5757
5351	5758	/* MKS Tenta SCOM-080x serial cards */
5352	5759	{ PCI_DEVICE(0x1601, 0x0800), .driver_data = pbn_b0_4_1250000 },