|
@@ -281,7 +281,6 @@ struct uart_amba_port {
|
|
|
unsigned int old_status;
|
|
|
unsigned int fifosize; /* vendor-specific */
|
|
|
unsigned int old_cr; /* state during shutdown */
|
|
|
- bool autorts;
|
|
|
unsigned int fixed_baud; /* vendor-set fixed baud rate */
|
|
|
char type[12];
|
|
|
#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_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 */
|
|
|
TIOCMBIT(TIOCM_RTS, UART011_CR_RTSEN);
|
|
|
}
|
|
@@ -1840,7 +1839,7 @@ static void pl011_disable_uart(struct uart_amba_port *uap)
|
|
|
{
|
|
|
unsigned int cr;
|
|
|
|
|
|
- uap->autorts = false;
|
|
|
+ uap->port.status &= ~(UPSTAT_AUTOCTS | UPSTAT_AUTORTS);
|
|
|
spin_lock_irq(&uap->port.lock);
|
|
|
cr = pl011_read(uap, REG_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_CTSEN;
|
|
|
- uap->autorts = true;
|
|
|
+ port->status |= UPSTAT_AUTOCTS | UPSTAT_AUTORTS;
|
|
|
} else {
|
|
|
old_cr &= ~(UART011_CR_CTSEN | UART011_CR_RTSEN);
|
|
|
- uap->autorts = false;
|
|
|
+ port->status &= ~(UPSTAT_AUTOCTS | UPSTAT_AUTORTS);
|
|
|
}
|
|
|
|
|
|
if (uap->vendor->oversampling) {
|