From: Heikki Krogerus Date: Thu, 11 Sep 2014 12:26:12 +0000 (+0300) Subject: serial: 8250_pci: remove rts_n override from Baytrail quirk X-Git-Tag: firefly_0821_release~176^2~3120^2~9 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=716e115cd7f75e3ab717f467432fd4b8cd23ee2c;p=firefly-linux-kernel-4.4.55.git serial: 8250_pci: remove rts_n override from Baytrail quirk It should not be used together with Auto Flow Control, and Auto Flow Control is always enabled on Baytrail. Signed-off-by: Heikki Krogerus Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c index 14d3e6be8800..4f1cd296f1b1 100644 --- a/drivers/tty/serial/8250/8250_pci.c +++ b/drivers/tty/serial/8250/8250_pci.c @@ -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); }