1 files changed, 42 insertions, 0 deletions

diff --git a/drivers/tty/serial/8250_pci.c b/drivers/tty/serial/8250_pci.c
index 3abeca2a2a1b..825937a5f210 100644
--- a/drivers/tty/serial/8250_pci.c
+++ b/drivers/tty/serial/8250_pci.c
@@ -1101,6 +1101,15 @@ static int pci_eg20t_init(struct pci_dev *dev)
 #endif
 }
 
+static int
+pci_xr17c154_setup(struct serial_private *priv,
+                  const struct pciserial_board *board,
+                  struct uart_port *port, int idx)
+{
+        port->flags |= UPF_EXAR_EFR;
+        return pci_default_setup(priv, board, port, idx);
+}
+
 /* This should be in linux/pci_ids.h */
 #define PCI_VENDOR_ID_SBSMODULARIO      0x124B
 #define PCI_SUBVENDOR_ID_SBSMODULARIO   0x124B
@@ -1506,6 +1515,30 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                 .setup          = pci_timedia_setup,
         },
         /*
+         * Exar cards
+         */
+        {
+                .vendor = PCI_VENDOR_ID_EXAR,
+                .device = PCI_DEVICE_ID_EXAR_XR17C152,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .setup          = pci_xr17c154_setup,
+        },
+        {
+                .vendor = PCI_VENDOR_ID_EXAR,
+                .device = PCI_DEVICE_ID_EXAR_XR17C154,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .setup          = pci_xr17c154_setup,
+        },
+        {
+                .vendor = PCI_VENDOR_ID_EXAR,
+                .device = PCI_DEVICE_ID_EXAR_XR17C158,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .setup          = pci_xr17c154_setup,
+        },
+        /*
          * Xircom cards
          */
         {
@@ -1558,46 +1591,55 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                 .vendor         = PCI_VENDOR_ID_INTEL,
                 .device         = 0x8811,
                 .init           = pci_eg20t_init,
+                .setup          = pci_default_setup,
         },
         {
                 .vendor         = PCI_VENDOR_ID_INTEL,
                 .device         = 0x8812,
                 .init           = pci_eg20t_init,
+                .setup          = pci_default_setup,
         },
         {
                 .vendor         = PCI_VENDOR_ID_INTEL,
                 .device         = 0x8813,
                 .init           = pci_eg20t_init,
+                .setup          = pci_default_setup,
         },
         {
                 .vendor         = PCI_VENDOR_ID_INTEL,
                 .device         = 0x8814,
                 .init           = pci_eg20t_init,
+                .setup          = pci_default_setup,
         },
         {
                 .vendor         = 0x10DB,
                 .device         = 0x8027,
                 .init           = pci_eg20t_init,
+                .setup          = pci_default_setup,
         },
         {
                 .vendor         = 0x10DB,
                 .device         = 0x8028,
                 .init           = pci_eg20t_init,
+                .setup          = pci_default_setup,
         },
         {
                 .vendor         = 0x10DB,
                 .device         = 0x8029,
                 .init           = pci_eg20t_init,
+                .setup          = pci_default_setup,
         },
         {
                 .vendor         = 0x10DB,
                 .device         = 0x800C,
                 .init           = pci_eg20t_init,
+                .setup          = pci_default_setup,
         },
         {
                 .vendor         = 0x10DB,
                 .device         = 0x800D,
                 .init           = pci_eg20t_init,
+                .setup          = pci_default_setup,
         },
         /*
          * Cronyx Omega PCI (PLX-chip based)