2 files changed, 52 insertions, 1 deletions

diff --git a/drivers/tty/serial/8250.c b/drivers/tty/serial/8250.c
index 435ce14e676c..82ca71aa9d10 100644
--- a/drivers/tty/serial/8250.c
+++ b/drivers/tty/serial/8250.c
@@ -309,6 +309,13 @@ static const struct serial8250_config uart_config[] = {
                                   UART_FCR_T_TRIG_01,
                 .flags          = UART_CAP_FIFO | UART_CAP_RTOIE,
         },
+        [PORT_XR17D15X] = {
+                .name           = "XR17D15X",
+                .fifo_size      = 64,
+                .tx_loadsz      = 64,
+                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
+                .flags          = UART_CAP_FIFO | UART_CAP_AFE | UART_CAP_EFR,
+        },
 };
 
 #if defined(CONFIG_MIPS_ALCHEMY)
@@ -1075,6 +1082,14 @@ static void autoconfig_16550a(struct uart_8250_port *up)
         serial_outp(up, UART_IER, iersave);
 
         /*
+         * Exar uarts have EFR in a weird location
+         */
+        if (up->port.flags & UPF_EXAR_EFR) {
+                up->port.type = PORT_XR17D15X;
+                up->capabilities |= UART_CAP_AFE | UART_CAP_EFR;
+        }
+
+        /*
          * We distinguish between 16550A and U6 16550A by counting
          * how many bytes are in the FIFO.
          */
@@ -2417,7 +2432,10 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
                         efr |= UART_EFR_CTS;
 
                 serial_outp(up, UART_LCR, UART_LCR_CONF_MODE_B);
-                serial_outp(up, UART_EFR, efr);
+                if (up->port.flags & UPF_EXAR_EFR)
+                        serial_outp(up, UART_XR_EFR, efr);
+                else
+                        serial_outp(up, UART_EFR, efr);
         }
 
 #ifdef CONFIG_ARCH_OMAP
diff --git a/drivers/tty/serial/8250_pci.c b/drivers/tty/serial/8250_pci.c
index 6b887d90a205..a79caba96d12 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
          */
         {