From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ezequiel Garcia Subject: Re: [PATCH] parport: Add support for the WCH353 1S/1P multi-IO card Date: Sat, 24 May 2014 15:36:14 -0300 Message-ID: <20140524183614.GA27495@arch.cereza> References: <1400955891-27294-1-git-send-email-ezequiel.garcia@free-electrons.com> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Content-Disposition: inline In-Reply-To: <1400955891-27294-1-git-send-email-ezequiel.garcia@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org To: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Gianluca Anzolin , Alan Cox , Greg Kroah-Hartman List-Id: linux-serial@vger.kernel.org (Ccing linux-serial) On 24 May 03:24 PM, Ezequiel Garcia wrote: > This Multi-IO card has one serial 16550-like and one parallel port co= nnector. > Here's the lspci output, after this commit is applied: >=20 > 03:07.0 Serial controller: Device 4348:5053 (rev 10) (prog-if 02 [165= 50]) > Subsystem: Device 4348:5053 > Control: I/O+ Mem- BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr- = Stepping- SERR- FastB2B- DisINTx- > Status: Cap- 66MHz- UDF- FastB2B- ParErr- DEVSEL=3Dmedium >TAbort- <= TAbort- SERR- Interrupt: pin A routed to IRQ 21 > Region 0: I/O ports at cf00 [size=3D8] > Region 1: I/O ports at ce00 [size=3D8] > Kernel driver in use: parport_serial > Kernel modules: 8250_pci, parport_serial >=20 > This commit adds an entry with the device ID to the blacklist declare= d in > 8250_pci to prevent the driver from taking ownership. Also, and as wa= s done > for the 2S/1P variant, add a quirk to skip autodetection and set the = correct > type to 16550A clone. >=20 > Proper entries are added to parport_serial, to support the device par= allel > and serial ports. >=20 > Cc: Gianluca Anzolin > Cc: Alan Cox > Cc: Greg Kroah-Hartman > Signed-off-by: Ezequiel Garcia > --- > drivers/parport/parport_serial.c | 9 +++++++++ > drivers/tty/serial/8250/8250_pci.c | 10 ++++++++++ > 2 files changed, 19 insertions(+) >=20 > diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parpo= rt_serial.c > index ff53314..ee93200 100644 > --- a/drivers/parport/parport_serial.c > +++ b/drivers/parport/parport_serial.c > @@ -62,6 +62,7 @@ enum parport_pc_pci_cards { > timedia_9079a, > timedia_9079b, > timedia_9079c, > + wch_ch353_1s1p, > wch_ch353_2s1p, > sunix_2s1p, > }; > @@ -148,6 +149,7 @@ static struct parport_pc_pci cards[] =3D { > /* timedia_9079a */ { 1, { { 2, 3 }, } }, > /* timedia_9079b */ { 1, { { 2, 3 }, } }, > /* timedia_9079c */ { 1, { { 2, 3 }, } }, > + /* wch_ch353_1s1p*/ { 1, { { 1, -1}, } }, > /* wch_ch353_2s1p*/ { 1, { { 2, -1}, } }, > /* sunix_2s1p */ { 1, { { 3, -1 }, } }, > }; > @@ -253,6 +255,7 @@ static struct pci_device_id parport_serial_pci_tb= l[] =3D { > { 0x1409, 0x7168, 0x1409, 0xd079, 0, 0, timedia_9079c }, > =20 > /* WCH CARDS */ > + { 0x4348, 0x5053, PCI_ANY_ID, PCI_ANY_ID, 0, 0, wch_ch353_1s1p}, > { 0x4348, 0x7053, 0x4348, 0x3253, 0, 0, wch_ch353_2s1p}, > =20 > /* > @@ -479,6 +482,12 @@ static struct pciserial_board pci_parport_serial= _boards[] =3D { > .base_baud =3D 921600, > .uart_offset =3D 8, > }, > + [wch_ch353_1s1p] =3D { > + .flags =3D FL_BASE0|FL_BASE_BARS, > + .num_ports =3D 1, > + .base_baud =3D 115200, > + .uart_offset =3D 8, > + }, > [wch_ch353_2s1p] =3D { > .flags =3D FL_BASE0|FL_BASE_BARS, > .num_ports =3D 2, > diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/= 8250/8250_pci.c > index b14bcba..f35a85f 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= , > #define PCI_DEVICE_ID_WCH_CH352_2S 0x3253 > #define PCI_DEVICE_ID_WCH_CH353_4S 0x3453 > #define PCI_DEVICE_ID_WCH_CH353_2S1PF 0x5046 > +#define PCI_DEVICE_ID_WCH_CH353_1S1P 0x5053 > #define PCI_DEVICE_ID_WCH_CH353_2S1P 0x7053 > #define PCI_VENDOR_ID_AGESTAR 0x5372 > #define PCI_DEVICE_ID_AGESTAR_9375 0x6872 > @@ -2410,6 +2411,14 @@ static struct pci_serial_quirk pci_serial_quir= ks[] __refdata =3D { > .subdevice =3D PCI_ANY_ID, > .setup =3D pci_omegapci_setup, > }, > + /* WCH CH353 1S1P card (16550 clone) */ > + { > + .vendor =3D PCI_VENDOR_ID_WCH, > + .device =3D PCI_DEVICE_ID_WCH_CH353_1S1P, > + .subvendor =3D PCI_ANY_ID, > + .subdevice =3D PCI_ANY_ID, > + .setup =3D pci_wch_ch353_setup, > + }, > /* WCH CH353 2S1P card (16550 clone) */ > { > .vendor =3D PCI_VENDOR_ID_WCH, > @@ -3526,6 +3535,7 @@ static const struct pci_device_id blacklist[] =3D= { > =20 > /* multi-io cards handled by parport_serial */ > { PCI_DEVICE(0x4348, 0x7053), }, /* WCH CH353 2S1P */ > + { PCI_DEVICE(0x4348, 0x5053), }, /* WCH CH353 1S1P */ > }; > =20 > /* > --=20 > 1.9.1 >=20 --=20 Ezequiel Garc=EDa, Free Electrons Embedded Linux, Kernel and Android Engineering http://free-electrons.com