Frédéric Brière | 29 May 2011 21:08

[PATCH 1/2] serial: 8250_pci: add .probe member to struct pci_serial_quirk

This function, if present, is called early on by the 8250_pci probe; it
can be used to reject devices meant for parport_serial.  (The .init
function cannot be used for this purpose, as it is also called by
parport_serial.)

Signed-off-by: Frédéric Brière <fbriere <at> fbriere.net>
Cc: Greg Kroah-Hartman <gregkh <at> suse.de>
Cc: Alan Cox <alan <at> linux.intel.com>
Cc: linux-serial <at> vger.kernel.org
Cc: linux-parport <at> lists.infradead.org
---
 drivers/tty/serial/8250_pci.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/drivers/tty/serial/8250_pci.c b/drivers/tty/serial/8250_pci.c
index 4b4968a..e6fb67b 100644
--- a/drivers/tty/serial/8250_pci.c
+++ b/drivers/tty/serial/8250_pci.c
 <at>  <at>  -39,6 +39,7  <at>  <at>  struct pci_serial_quirk {
 	u32	device;
 	u32	subvendor;
 	u32	subdevice;
+	int	(*probe)(struct pci_dev *dev);
 	int	(*init)(struct pci_dev *dev);
 	int	(*setup)(struct serial_private *,
 			 const struct pciserial_board *,
 <at>  <at>  -2581,11 +2582,19  <at>  <at>  EXPORT_SYMBOL_GPL(pciserial_resume_ports);
 static int __devinit
 pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
 {
(Continue reading)

Frédéric Brière | 29 May 2011 21:08

[PATCH 2/2] parport/serial: add support for Timedia/SUNIX cards to parport_serial

Timedia/SUNIX PCI cards with both serial and parallel ports are
currently supported by 8250_pci and parport_pc individually.  Moving
that support into parport_serial allows using both types of ports at the
same time.

This was successfully tested with a SUNIX 4079T.

Signed-off-by: Frédéric Brière <fbriere <at> fbriere.net>
Cc: Greg Kroah-Hartman <gregkh <at> suse.de>
Cc: Alan Cox <alan <at> linux.intel.com>
Cc: linux-serial <at> vger.kernel.org
Cc: linux-parport <at> lists.infradead.org
---
 drivers/parport/parport_pc.c     |   54 -------------
 drivers/parport/parport_serial.c |  163 ++++++++++++++++++++++++++++++++++++++
 drivers/tty/serial/8250_pci.c    |   23 ++++++
 3 files changed, 186 insertions(+), 54 deletions(-)

diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index f330338..d1cdb94 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
 <at>  <at>  -2864,24 +2864,6  <at>  <at>  enum parport_pc_pci_cards {
 	lava_parallel_dual_b,
 	boca_ioppar,
 	plx_9050,
-	timedia_4078a,
-	timedia_4079h,
-	timedia_4085h,
-	timedia_4088a,
(Continue reading)

Alan Cox | 1 Jun 2011 14:41
Picon

Re: [PATCH 2/2] parport/serial: add support for Timedia/SUNIX cards to parport_serial

On Sun, 29 May 2011 15:08:04 -0400
Frédéric Brière <fbriere <at> fbriere.net> wrote:

> Timedia/SUNIX PCI cards with both serial and parallel ports are
> currently supported by 8250_pci and parport_pc individually.  Moving
> that support into parport_serial allows using both types of ports at
> the same time.
> 
> This was successfully tested with a SUNIX 4079T.
> 
> Signed-off-by: Frédéric Brière <fbriere <at> fbriere.net>
> Cc: Greg Kroah-Hartman <gregkh <at> suse.de>
> Cc: Alan Cox <alan <at> linux.intel.com>
> Cc: linux-serial <at> vger.kernel.org
> Cc: linux-parport <at> lists.infradead.org

Acked-by: Alan Cox <alan <at> linux.intel.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in
the body of a message to majordomo <at> vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Gmane