p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

serial: pl011: Adopt generic flag to store auto RTS status 

Back in 2010, commit 3b43816f68 ("ARM: 5933/1: amba-pl011: support
hardware flow control") added an autorts flag to this driver to store
whether automatic hardware flow control is requested.

In 2015, commit 391f93f2ec ("serial: core: Rework hw-assisted flow
control support") added a flag with identical functionality to generic
code.

Switch over to that flag and drop the driver-specific one.

Cc: Rabin Vincent <rabin.vincent@stericsson.com>
Cc: Peter Hurley <peter@hurleysoftware.com>
Cc: Russell King <linux@armlinux.org.uk>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Lukas Wunner 2017-10-25 10:06:33 +02:00 committed by Greg Kroah-Hartman
parent 3236a96548
commit 2a76fa2830
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/tty/serial/amba-pl011.c
View File

@ -281,7 +281,6 @@ struct uart_amba_port {
unsigned int old_status; unsigned int old_status;
unsigned int fifosize; /* vendor-specific */ unsigned int fifosize; /* vendor-specific */
unsigned int old_cr; /* state during shutdown */ unsigned int old_cr; /* state during shutdown */
bool autorts;
unsigned int fixed_baud; /* vendor-set fixed baud rate */ unsigned int fixed_baud; /* vendor-set fixed baud rate */
char type[12]; char type[12];
#ifdef CONFIG_DMA_ENGINE #ifdef CONFIG_DMA_ENGINE
@ -1586,7 +1585,7 @@ static void pl011_set_mctrl(struct uart_port *port, unsigned int mctrl)
TIOCMBIT(TIOCM_OUT2, UART011_CR_OUT2); TIOCMBIT(TIOCM_OUT2, UART011_CR_OUT2);
TIOCMBIT(TIOCM_LOOP, UART011_CR_LBE); TIOCMBIT(TIOCM_LOOP, UART011_CR_LBE);
if (uap->autorts) { if (port->status & UPSTAT_AUTORTS) {
/* We need to disable auto-RTS if we want to turn RTS off */ /* We need to disable auto-RTS if we want to turn RTS off */
TIOCMBIT(TIOCM_RTS, UART011_CR_RTSEN); TIOCMBIT(TIOCM_RTS, UART011_CR_RTSEN);
} }
@ -1840,7 +1839,7 @@ static void pl011_disable_uart(struct uart_amba_port *uap)
{ {
unsigned int cr; unsigned int cr;
uap->autorts = false; uap->port.status &= ~(UPSTAT_AUTOCTS | UPSTAT_AUTORTS);
spin_lock_irq(&uap->port.lock); spin_lock_irq(&uap->port.lock);
cr = pl011_read(uap, REG_CR); cr = pl011_read(uap, REG_CR);
uap->old_cr = cr; uap->old_cr = cr;
@ -2026,10 +2025,10 @@ pl011_set_termios(struct uart_port *port, struct ktermios *termios,
old_cr |= UART011_CR_RTSEN; old_cr |= UART011_CR_RTSEN;
old_cr |= UART011_CR_CTSEN; old_cr |= UART011_CR_CTSEN;
uap->autorts = true; port->status |= UPSTAT_AUTOCTS | UPSTAT_AUTORTS;
} else { } else {
old_cr &= ~(UART011_CR_CTSEN | UART011_CR_RTSEN); old_cr &= ~(UART011_CR_CTSEN | UART011_CR_RTSEN);
uap->autorts = false; port->status &= ~(UPSTAT_AUTOCTS | UPSTAT_AUTORTS);
} }
if (uap->vendor->oversampling) { if (uap->vendor->oversampling) {