Merge tag 'tty-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty/serial updates from Greg KH:
 "Here is the big tty/serial driver pull request for 4.15-rc1.

  Lots of serial driver updates in here, some small vt cleanups, and a
  raft of SPDX and license boilerplate cleanups, messing up the diffstat
  a bit.

  Nothing major, with no realy functional changes except better hardware
  support for some platforms.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'tty-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (110 commits)
  tty: ehv_bytechan: fix spelling mistake
  tty: serial: meson: allow baud-rates lower than 9600
  serial: 8250_fintek: Fix crash with baud rate B0
  serial: 8250_fintek: Disable delays for ports != 0
  serial: 8250_fintek: Return -EINVAL on invalid configuration
  tty: Remove redundant license text
  tty: serdev: Remove redundant license text
  tty: hvc: Remove redundant license text
  tty: serial: Remove redundant license text
  tty: add SPDX identifiers to all remaining files in drivers/tty/
  tty: serial: jsm: remove redundant pointer ts
  tty: serial: jsm: add space before the open parenthesis '('
  tty: serial: jsm: fix coding style
  tty: serial: jsm: delete space between function name and '('
  tty: serial: jsm: add blank line after declarations
  tty: serial: jsm: change the type of local variable
  tty: serial: imx: remove dead code imx_dma_rxint
  tty: serial: imx: disable ageing timer interrupt if dma in use
  serial: 8250: fix potential deadlock in rs485-mode
  serial: m32r_sio: Drop redundant .data assignment
  ...

1 files changed, 8 insertions, 24 deletions

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 111e6a950779..04af8de8617e 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *  Driver for AMBA serial ports
  *
@@ -7,20 +8,6 @@
  *  Copyright (C) 2000 Deep Blue Solutions Ltd.
  *  Copyright (C) 2010 ST-Ericsson SA
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  * This is a generic driver for ARM AMBA-type serial ports.  They
  * have a lot of 16550-like features, but are not register compatible.
  * Note that although they do have CTS, DCD and DSR inputs, they do
@@ -281,7 +268,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
@@ -1078,9 +1064,9 @@ static inline void pl011_dma_rx_stop(struct uart_amba_port *uap)
  * Every polling, It checks the residue in the dma buffer and transfer
  * data to the tty. Also, last_residue is updated for the next polling.
  */
-static void pl011_dma_rx_poll(unsigned long args)
+static void pl011_dma_rx_poll(struct timer_list *t)
 {
-        struct uart_amba_port *uap = (struct uart_amba_port *)args;
+        struct uart_amba_port *uap = from_timer(uap, t, dmarx.timer);
         struct tty_port *port = &uap->port.state->port;
         struct pl011_dmarx_data *dmarx = &uap->dmarx;
         struct dma_chan *rxchan = uap->dmarx.chan;
@@ -1192,9 +1178,7 @@ skip_rx:
                         dev_dbg(uap->port.dev, "could not trigger initial "
                                 "RX DMA job, fall back to interrupt mode\n");
                 if (uap->dmarx.poll_rate) {
-                        init_timer(&(uap->dmarx.timer));
-                        uap->dmarx.timer.function = pl011_dma_rx_poll;
-                        uap->dmarx.timer.data = (unsigned long)uap;
+                        timer_setup(&uap->dmarx.timer, pl011_dma_rx_poll, 0);
                         mod_timer(&uap->dmarx.timer,
                                 jiffies +
                                 msecs_to_jiffies(uap->dmarx.poll_rate));
@@ -1588,7 +1572,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);
         }
@@ -1842,7 +1826,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;
@@ -2028,10 +2012,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) {