diff options
author | Ezequiel Garcia <ezequiel.garcia@free-electrons.com> | 2014-05-24 14:24:51 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-28 15:30:48 -0400 |
commit | feb5814254094c306429fe6d7b9c534fa0250f4c (patch) | |
tree | 038641e4554a574f315bdc5edb70e1d358d8279b /drivers/tty | |
parent | c67f866dbb9b36593d0f6af177e99047ecebf95a (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/tty')
-rw-r--r-- | drivers/tty/serial/8250/8250_pci.c | 10 |
1 files changed, 10 insertions, 0 deletions
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 | /* |