serial: 8250_pci: remove rts_n override from Baytrail quirk
authorHeikki Krogerus <heikki.krogerus@linux.intel.com>
Thu, 11 Sep 2014 12:26:12 +0000 (15:26 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 29 Sep 2014 01:35:56 +0000 (21:35 -0400)
It should not be used together with Auto Flow Control, and
Auto Flow Control is always enabled on Baytrail.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250_pci.c

index 14d3e6be880010575d56a888494463d1702a27f4..4f1cd296f1b13bb4a56d55f5b5e96d76a2a0b6fe 100644 (file)
@@ -1355,9 +1355,6 @@ ce4100_serial_setup(struct serial_private *priv,
 #define BYT_PRV_CLK_N_VAL_SHIFT                16
 #define BYT_PRV_CLK_UPDATE             (1 << 31)
 
-#define BYT_GENERAL_REG                        0x808
-#define BYT_GENERAL_DIS_RTS_N_OVERRIDE (1 << 3)
-
 #define BYT_TX_OVF_INT                 0x820
 #define BYT_TX_OVF_INT_MASK            (1 << 1)
 
@@ -1412,16 +1409,6 @@ byt_set_termios(struct uart_port *p, struct ktermios *termios,
        reg |= BYT_PRV_CLK_EN | BYT_PRV_CLK_UPDATE;
        writel(reg, p->membase + BYT_PRV_CLK);
 
-       /*
-        * If auto-handshake mechanism is not enabled,
-        * disable rts_n override
-        */
-       reg = readl(p->membase + BYT_GENERAL_REG);
-       reg &= ~BYT_GENERAL_DIS_RTS_N_OVERRIDE;
-       if (termios->c_cflag & CRTSCTS)
-               reg |= BYT_GENERAL_DIS_RTS_N_OVERRIDE;
-       writel(reg, p->membase + BYT_GENERAL_REG);
-
        serial8250_do_set_termios(p, termios, old);
 }