Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f46aa4a4 authored by Jeremy McNicoll's avatar Jeremy McNicoll Committed by Sasha Levin
Browse files

tty: Add support for PCIe WCH382 2S multi-IO card 



[ Upstream commit 7dde55787b43a8f2b4021916db38d90c03a2ec64 ]

WCH382 2S board is a PCIe card with 2 DB9 COM ports detected as
Serial controller: Device 1c00:3253 (rev 10) (prog-if 05 [16850])

Signed-off-by: default avatarJeremy McNicoll <jmcnicol@redhat.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 2317e495

drivers/tty/serial/8250/8250_pci.c

+21 −1
Original line number Diff line number Diff line
@@ -1832,6 +1832,7 @@ pci_wch_ch38x_setup(struct serial_private *priv, 
#define PCIE_VENDOR_ID_WCH		0x1c00

#define PCIE_DEVICE_ID_WCH_CH382_2S1P	0x3250

#define PCIE_DEVICE_ID_WCH_CH384_4S	0x3470

#define PCIE_DEVICE_ID_WCH_CH382_2S	0x3253



#define PCI_DEVICE_ID_EXAR_XR17V4358	0x4358

#define PCI_DEVICE_ID_EXAR_XR17V8358	0x8358
@@ -2543,6 +2544,14 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = { 
		.subdevice	= PCI_ANY_ID,

		.setup		= pci_wch_ch353_setup,

	},

	/* WCH CH382 2S card (16850 clone) */

	{

		.vendor         = PCIE_VENDOR_ID_WCH,

		.device         = PCIE_DEVICE_ID_WCH_CH382_2S,

		.subvendor      = PCI_ANY_ID,

		.subdevice      = PCI_ANY_ID,

		.setup          = pci_wch_ch38x_setup,

	},

	/* WCH CH382 2S1P card (16850 clone) */

	{

		.vendor         = PCIE_VENDOR_ID_WCH,
@@ -2857,6 +2866,7 @@ enum pci_board_num_t { 
	pbn_fintek_4,

	pbn_fintek_8,

	pbn_fintek_12,

	pbn_wch382_2,

	pbn_wch384_4,

};
@@ -3659,7 +3669,13 @@ static struct pciserial_board pci_boards[] = { 
		.base_baud	= 115200,

		.first_offset	= 0x40,

	},



	[pbn_wch382_2] = {

		.flags		= FL_BASE0,

		.num_ports	= 2,

		.base_baud	= 115200,

		.uart_offset	= 8,

		.first_offset	= 0xC0,

	},

	[pbn_wch384_4] = {

		.flags		= FL_BASE0,

		.num_ports	= 4,
@@ -5403,6 +5419,10 @@ static struct pci_device_id serial_pci_tbl[] = { 
		PCI_ANY_ID, PCI_ANY_ID,

		0, 0, pbn_b0_bt_2_115200 },



	{	PCIE_VENDOR_ID_WCH, PCIE_DEVICE_ID_WCH_CH382_2S,

		PCI_ANY_ID, PCI_ANY_ID,

		0, 0, pbn_wch382_2 },



	{	PCIE_VENDOR_ID_WCH, PCIE_DEVICE_ID_WCH_CH384_4S,

		PCI_ANY_ID, PCI_ANY_ID,

		0, 0, pbn_wch384_4 },