> On Wednesday, June 01, 2011 7:31 PM, Tomoya MORINAGA [mailto:tomoya-linux@xxxxxxxxxxxxxxx] wrote: > > Intel EG20T PCH has UART device which is compatible with 8250. > Currently, with general configuration, the PCH UART driver is not loaded but > 8250 standard driver is loaded. > Therefore, in case of using PCH UART driver, need to disable 8250 pci function. > However, this procedure is not best solution. > This patch, in 8250_pci, if the device is the PCH or the family IOH, > '-ENODEV' is returned. > As a result, disabling 8250-pci processing becomes unnecessary. > > Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx> > --- > V5: Rename own_init again. > return_ENODEV() to pci_eg20t_init() > > V4: Rename own_init to return_ENODEV > Add #if defined ~ #endif > > V3: add own init() and set the init() to quirk table. > > V2: Delete #ifdef CONFIG_SERIAL_PCH_UART ~ #endif > Use quirk table structure > --- > drivers/tty/serial/8250_pci.c | 59 +++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 59 insertions(+), 0 deletions(-) > > diff --git a/drivers/tty/serial/8250_pci.c b/drivers/tty/serial/8250_pci.c > index 738cec9..2b40fbf 100644 > --- a/drivers/tty/serial/8250_pci.c > +++ b/drivers/tty/serial/8250_pci.c > @@ -988,6 +988,15 @@ static int skip_tx_en_setup(struct serial_private *priv, > return pci_default_setup(priv, board, port, idx); > } > > +static int pci_eg20t_init(struct pci_dev *dev) > +{ > +#if defined(CONFIG_SERIAL_PCH_UART) || defined(CONFIG_SERIAL_PCH_UART_MODULE) > + return -ENODEV; > +#else > + return 0; > +#endif > +} > + > /* This should be in linux/pci_ids.h */ > #define PCI_VENDOR_ID_SBSMODULARIO 0x124B > #define PCI_SUBVENDOR_ID_SBSMODULARIO 0x124B > @@ -1430,6 +1439,56 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = { > .init = pci_oxsemi_tornado_init, > .setup = pci_default_setup, > }, > + { > + .vendor = PCI_VENDOR_ID_INTEL, > + .device = 0x8811, > + .init = pci_eg20t_init, > + }, > + { > + .vendor = PCI_VENDOR_ID_INTEL, > + .device = 0x8812, > + .init = pci_eg20t_init, > + }, > + { > + .vendor = PCI_VENDOR_ID_INTEL, > + .device = 0x8813, > + .init = pci_eg20t_init, > + }, > + { > + .vendor = PCI_VENDOR_ID_INTEL, > + .device = 0x8814, > + .init = pci_eg20t_init, > + }, > + { > + .vendor = 0x10DB, > + .device = 0x8027, > + .init = pci_eg20t_init, > + }, > + { > + .vendor = 0x10DB, > + .device = 0x8028, > + .init = pci_eg20t_init, > + }, > + { > + .vendor = 0x10DB, > + .device = 0x8029, > + .init = pci_eg20t_init, > + }, > + { > + .vendor = 0x10DB, > + .device = 0x800C, > + .init = pci_eg20t_init, > + }, > + { > + .vendor = 0x10DB, > + .device = 0x800D, > + .init = pci_eg20t_init, > + }, > + { > + .vendor = 0x10DB, > + .device = 0x800D, > + .init = pci_eg20t_init, > + }, > /* > * Default "match everything" terminator entry > */ > > -- > 1.7.4 We would like to add this fix as soon as it is acceptable. Will this version of this patch be accepted and applied? regards Joel Clark MeeGo IVI -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
