aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/parport/parport_serial.c9
-rw-r--r--drivers/tty/serial/8250/8250_pci.c10
2 files changed, 19 insertions, 0 deletions
diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index ff53314100f6..ee932004724f 100644
--- a/drivers/parport/parport_serial.c
+++ b/drivers/parport/parport_serial.c
@@ -62,6 +62,7 @@ enum parport_pc_pci_cards {
62 timedia_9079a, 62 timedia_9079a,
63 timedia_9079b, 63 timedia_9079b,
64 timedia_9079c, 64 timedia_9079c,
65 wch_ch353_1s1p,
65 wch_ch353_2s1p, 66 wch_ch353_2s1p,
66 sunix_2s1p, 67 sunix_2s1p,
67}; 68};
@@ -148,6 +149,7 @@ static struct parport_pc_pci cards[] = {
148 /* timedia_9079a */ { 1, { { 2, 3 }, } }, 149 /* timedia_9079a */ { 1, { { 2, 3 }, } },
149 /* timedia_9079b */ { 1, { { 2, 3 }, } }, 150 /* timedia_9079b */ { 1, { { 2, 3 }, } },
150 /* timedia_9079c */ { 1, { { 2, 3 }, } }, 151 /* timedia_9079c */ { 1, { { 2, 3 }, } },
152 /* wch_ch353_1s1p*/ { 1, { { 1, -1}, } },
151 /* wch_ch353_2s1p*/ { 1, { { 2, -1}, } }, 153 /* wch_ch353_2s1p*/ { 1, { { 2, -1}, } },
152 /* sunix_2s1p */ { 1, { { 3, -1 }, } }, 154 /* sunix_2s1p */ { 1, { { 3, -1 }, } },
153}; 155};
@@ -253,6 +255,7 @@ static struct pci_device_id parport_serial_pci_tbl[] = {
253 { 0x1409, 0x7168, 0x1409, 0xd079, 0, 0, timedia_9079c }, 255 { 0x1409, 0x7168, 0x1409, 0xd079, 0, 0, timedia_9079c },
254 256
255 /* WCH CARDS */ 257 /* WCH CARDS */
258 { 0x4348, 0x5053, PCI_ANY_ID, PCI_ANY_ID, 0, 0, wch_ch353_1s1p},
256 { 0x4348, 0x7053, 0x4348, 0x3253, 0, 0, wch_ch353_2s1p}, 259 { 0x4348, 0x7053, 0x4348, 0x3253, 0, 0, wch_ch353_2s1p},
257 260
258 /* 261 /*
@@ -479,6 +482,12 @@ static struct pciserial_board pci_parport_serial_boards[] = {
479 .base_baud = 921600, 482 .base_baud = 921600,
480 .uart_offset = 8, 483 .uart_offset = 8,
481 }, 484 },
485 [wch_ch353_1s1p] = {
486 .flags = FL_BASE0|FL_BASE_BARS,
487 .num_ports = 1,
488 .base_baud = 115200,
489 .uart_offset = 8,
490 },
482 [wch_ch353_2s1p] = { 491 [wch_ch353_2s1p] = {
483 .flags = FL_BASE0|FL_BASE_BARS, 492 .flags = FL_BASE0|FL_BASE_BARS,
484 .num_ports = 2, 493 .num_ports = 2,
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index b14bcba96c25..f35a85f56627 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -1778,6 +1778,7 @@ pci_wch_ch353_setup(struct serial_private *priv,
1778#define PCI_DEVICE_ID_WCH_CH352_2S 0x3253 1778#define PCI_DEVICE_ID_WCH_CH352_2S 0x3253
1779#define PCI_DEVICE_ID_WCH_CH353_4S 0x3453 1779#define PCI_DEVICE_ID_WCH_CH353_4S 0x3453
1780#define PCI_DEVICE_ID_WCH_CH353_2S1PF 0x5046 1780#define PCI_DEVICE_ID_WCH_CH353_2S1PF 0x5046
1781#define PCI_DEVICE_ID_WCH_CH353_1S1P 0x5053
1781#define PCI_DEVICE_ID_WCH_CH353_2S1P 0x7053 1782#define PCI_DEVICE_ID_WCH_CH353_2S1P 0x7053
1782#define PCI_VENDOR_ID_AGESTAR 0x5372 1783#define PCI_VENDOR_ID_AGESTAR 0x5372
1783#define PCI_DEVICE_ID_AGESTAR_9375 0x6872 1784#define PCI_DEVICE_ID_AGESTAR_9375 0x6872
@@ -2410,6 +2411,14 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
2410 .subdevice = PCI_ANY_ID, 2411 .subdevice = PCI_ANY_ID,
2411 .setup = pci_omegapci_setup, 2412 .setup = pci_omegapci_setup,
2412 }, 2413 },
2414 /* WCH CH353 1S1P card (16550 clone) */
2415 {
2416 .vendor = PCI_VENDOR_ID_WCH,
2417 .device = PCI_DEVICE_ID_WCH_CH353_1S1P,
2418 .subvendor = PCI_ANY_ID,
2419 .subdevice = PCI_ANY_ID,
2420 .setup = pci_wch_ch353_setup,
2421 },
2413 /* WCH CH353 2S1P card (16550 clone) */ 2422 /* WCH CH353 2S1P card (16550 clone) */
2414 { 2423 {
2415 .vendor = PCI_VENDOR_ID_WCH, 2424 .vendor = PCI_VENDOR_ID_WCH,
@@ -3526,6 +3535,7 @@ static const struct pci_device_id blacklist[] = {
3526 3535
3527 /* multi-io cards handled by parport_serial */ 3536 /* multi-io cards handled by parport_serial */
3528 { PCI_DEVICE(0x4348, 0x7053), }, /* WCH CH353 2S1P */ 3537 { PCI_DEVICE(0x4348, 0x7053), }, /* WCH CH353 2S1P */
3538 { PCI_DEVICE(0x4348, 0x5053), }, /* WCH CH353 1S1P */
3529}; 3539};
3530 3540
3531/* 3541/*