diff options
author | Heikki Krogerus <heikki.krogerus@linux.intel.com> | 2014-09-11 08:26:12 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-28 21:35:56 -0400 |
commit | 716e115cd7f75e3ab717f467432fd4b8cd23ee2c (patch) | |
tree | ffcd289d2299fa5931438ed3be9122468361b02b /drivers/tty/serial | |
parent | 6fa62fc46e10f34aed70d2cfcf573ba8d3833e18 (diff) |
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 <heikki.krogerus@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial')
-rw-r--r-- | drivers/tty/serial/8250/8250_pci.c | 13 |
1 files changed, 0 insertions, 13 deletions
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, | |||
1355 | #define BYT_PRV_CLK_N_VAL_SHIFT 16 | 1355 | #define BYT_PRV_CLK_N_VAL_SHIFT 16 |
1356 | #define BYT_PRV_CLK_UPDATE (1 << 31) | 1356 | #define BYT_PRV_CLK_UPDATE (1 << 31) |
1357 | 1357 | ||
1358 | #define BYT_GENERAL_REG 0x808 | ||
1359 | #define BYT_GENERAL_DIS_RTS_N_OVERRIDE (1 << 3) | ||
1360 | |||
1361 | #define BYT_TX_OVF_INT 0x820 | 1358 | #define BYT_TX_OVF_INT 0x820 |
1362 | #define BYT_TX_OVF_INT_MASK (1 << 1) | 1359 | #define BYT_TX_OVF_INT_MASK (1 << 1) |
1363 | 1360 | ||
@@ -1412,16 +1409,6 @@ byt_set_termios(struct uart_port *p, struct ktermios *termios, | |||
1412 | reg |= BYT_PRV_CLK_EN | BYT_PRV_CLK_UPDATE; | 1409 | reg |= BYT_PRV_CLK_EN | BYT_PRV_CLK_UPDATE; |
1413 | writel(reg, p->membase + BYT_PRV_CLK); | 1410 | writel(reg, p->membase + BYT_PRV_CLK); |
1414 | 1411 | ||
1415 | /* | ||
1416 | * If auto-handshake mechanism is not enabled, | ||
1417 | * disable rts_n override | ||
1418 | */ | ||
1419 | reg = readl(p->membase + BYT_GENERAL_REG); | ||
1420 | reg &= ~BYT_GENERAL_DIS_RTS_N_OVERRIDE; | ||
1421 | if (termios->c_cflag & CRTSCTS) | ||
1422 | reg |= BYT_GENERAL_DIS_RTS_N_OVERRIDE; | ||
1423 | writel(reg, p->membase + BYT_GENERAL_REG); | ||
1424 | |||
1425 | serial8250_do_set_termios(p, termios, old); | 1412 | serial8250_do_set_termios(p, termios, old); |
1426 | } | 1413 | } |
1427 | 1414 | ||