aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/parport
diff options
context:
space:
mode:
authorEzequiel Garcia <ezequiel.garcia@free-electrons.com>2014-05-24 14:24:51 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-28 15:30:48 -0400
commitfeb5814254094c306429fe6d7b9c534fa0250f4c (patch)
tree038641e4554a574f315bdc5edb70e1d358d8279b /drivers/parport
parentc67f866dbb9b36593d0f6af177e99047ecebf95a (diff)
parport: Add support for the WCH353 1S/1P multi-IO card
This Multi-IO card has one serial 16550-like and one parallel port connector. Here's the lspci output, after this commit is applied: 03:07.0 Serial controller: Device 4348:5053 (rev 10) (prog-if 02 [16550]) Subsystem: Device 4348:5053 Control: I/O+ Mem- BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap- 66MHz- UDF- FastB2B- ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Interrupt: pin A routed to IRQ 21 Region 0: I/O ports at cf00 [size=8] Region 1: I/O ports at ce00 [size=8] Kernel driver in use: parport_serial Kernel modules: 8250_pci, parport_serial This commit adds an entry with the device ID to the blacklist declared in 8250_pci to prevent the driver from taking ownership. Also, and as was done for the 2S/1P variant, add a quirk to skip autodetection and set the correct type to 16550A clone. Proper entries are added to parport_serial, to support the device parallel and serial ports. Cc: Gianluca Anzolin <gianluca@sottospazio.it> Cc: Alan Cox <alan@linux.intel.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/parport')
-rw-r--r--drivers/parport/parport_serial.c9
1 files changed, 9 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,