AOSCOS: parport: Add support for the WCH384 4S/1P multi-IO card

WCH384 4S/1P is a PCI-E card with 1 LPT and 4 DB9 COM ports detected as
Serial controller: Device 1c00:3450 (rev 10) (prog-if 05 [16850])

[Mingcong Bai: Resolved minor merge conflicts in
drivers/tty/serial/8250/8250_pci.c.]

Signed-off-by: Huacai Chen <[email protected]>
Signed-off-by: Mingcong Bai <[email protected]>

Signed-off-by: Kexy Biscuit <[email protected]>

Author: chenhuacai

drivers/parport/parport_serial.c

@@ -60,6 +60,7 @@ enum parport_pc_pci_cards {
 	wch_ch353_2s1p,
 	wch_ch382_0s1p,
 	wch_ch382_2s1p,
+	wch_ch384_4s1p,
 	brainboxes_5s1p,
 	sunix_4008a,
 	sunix_5069a,
@@ -157,6 +158,7 @@ static struct parport_pc_pci cards[] = {
 	/* wch_ch353_2s1p*/             { 1, { { 2, -1}, } },
 	/* wch_ch382_0s1p*/		{ 1, { { 2, -1}, } },
 	/* wch_ch382_2s1p*/             { 1, { { 2, -1}, } },
+	/* wch_ch384_4s1p*/             { 1, { { 2, -1}, } },
 	/* brainboxes_5s1p */           { 1, { { 3, -1 }, } },
 	/* sunix_4008a */		{ 1, { { 1, 2 }, } },
 	/* sunix_5069a */		{ 1, { { 1, 2 }, } },
@@ -274,6 +276,8 @@ static struct pci_device_id parport_serial_pci_tbl[] = {
 	  0x1c00, 0x3050, 0, 0, wch_ch382_0s1p },
 	{ PCI_VENDOR_ID_WCHIC, PCI_DEVICE_ID_WCHIC_CH382_2S1P,
 	  0x1c00, 0x3250, 0, 0, wch_ch382_2s1p },
+	{ PCI_VENDOR_ID_WCHIC, PCI_DEVICE_ID_WCHIC_CH384_4S1P,
+	  0x1c00, 0x3450, 0, 0, wch_ch384_4s1p },
 
 	/* BrainBoxes PX272/PX306 MIO card */
 	{ PCI_VENDOR_ID_INTASHIELD, 0x4100,
@@ -562,6 +566,13 @@ static struct pciserial_board pci_parport_serial_boards[] = {
 		.uart_offset    = 8,
 		.first_offset   = 0xC0,
 	},
+	[wch_ch384_4s1p] = {
+		.flags          = FL_BASE0,
+		.num_ports      = 4,
+		.base_baud      = 115200,
+		.uart_offset    = 8,
+		.first_offset   = 0xC0,
+	},
 	[brainboxes_5s1p] = {
 		.flags		= FL_BASE2,
 		.num_ports	= 5,

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

@@ -74,6 +74,7 @@
 #define PCI_DEVICE_ID_AMCC_ADDIDATA_APCI7800 0x818e
 
 #define PCI_DEVICE_ID_WCHIC_CH384_4S	0x3470
+#define PCI_DEVICE_ID_WCHIC_CH384_4S1P	0x3450
 #define PCI_DEVICE_ID_WCHIC_CH384_8S	0x3853
 
 #define PCI_DEVICE_ID_MOXA_CP102E	0x1024
@@ -2905,6 +2906,14 @@ static struct pci_serial_quirk pci_serial_quirks[] = {
 		.subdevice      = PCI_ANY_ID,
 		.init           = pci_wch_ch38x_init,
 		.exit		= pci_wch_ch38x_exit,
+		.setup		= pci_wch_ch38x_setup,
+	},
+	/* WCH CH384 4S1P card (16850 clone) */
+	{
+		.vendor         = PCI_VENDOR_ID_WCHIC,
+		.device         = PCI_DEVICE_ID_WCHIC_CH384_4S1P,
+		.subvendor      = PCI_ANY_ID,
+		.subdevice      = PCI_ANY_ID,
 		.setup          = pci_wch_ch38x_setup,
 	},
 	/*
@@ -3982,6 +3991,8 @@ static const struct pci_device_id blacklist[] = {
 	{ PCI_VDEVICE(WCHCN, 0x5053), REPORT_CONFIG(PARPORT_SERIAL), },
 	/* WCH CH382 2S1P */
 	{ PCI_VDEVICE(WCHIC, 0x3250), REPORT_CONFIG(PARPORT_SERIAL), },
+	/* WCH CH384 4S1P */
+	{ PCI_VDEVICE(WCHIC, 0x3450), REPORT_CONFIG(PARPORT_SERIAL), },
 
 	/* Intel platforms with MID UART */
 	{ PCI_VDEVICE(INTEL, 0x081b), REPORT_8250_CONFIG(MID), },