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 ...
author: Linus Torvalds <torvalds@linux-foundation.org> 2017-11-14 00:05:31 -0500
committer: Linus Torvalds <torvalds@linux-foundation.org> 2017-11-14 00:05:31 -0500
commit: fb0255fb2941ef6f21742b2bc146d6b9aef4fedc (patch)
tree: 8334f3485152b1c887ddfe04ba9a95c8a704481c /drivers/tty/serial
parent: 449fcf3ab0baf3dde9952385e6789f2ca10c3980 (diff)
parent: 57f5d648c45c3d40a3257c06629c14fd53c383bc (diff)
134 files changed, 921 insertions, 1174 deletions
diff --git a/drivers/tty/serial/21285.c b/drivers/tty/serial/21285.c
index 804632b4a929..32b3acf8150a 100644
--- a/drivers/tty/serial/21285.c
+++ b/drivers/tty/serial/21285.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Driver for the serial port on the 21285 StrongArm-110 core logic chip.
 *
diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h
index b2bdc35f7495..ebfb0bd5bef5 100644
--- a/drivers/tty/serial/8250/8250.h
+++ b/drivers/tty/serial/8250/8250.h
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  Driver for 8250/16550-type serial ports
 *
 *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
 *
 *  Copyright (C) 2001 Russell King.
- *
- * 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.
 */
 #include <linux/serial_8250.h>
diff --git a/drivers/tty/serial/8250/8250_accent.c b/drivers/tty/serial/8250/8250_accent.c
index 522aeae05192..1691f1a57f89 100644
--- a/drivers/tty/serial/8250/8250_accent.c
+++ b/drivers/tty/serial/8250/8250_accent.c
@@ -1,10 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 *  Copyright (C) 2005 Russell King.
 *  Data taken from include/asm-i386/serial.h
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
 */
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/tty/serial/8250/8250_acorn.c b/drivers/tty/serial/8250/8250_acorn.c
index 402dfdd4940e..758c4aa203ab 100644
--- a/drivers/tty/serial/8250/8250_acorn.c
+++ b/drivers/tty/serial/8250/8250_acorn.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 *  linux/drivers/serial/acorn.c
 *
 *  Copyright (C) 1996-2003 Russell King.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
 */
 #include <linux/module.h>
 #include <linux/types.h>
diff --git a/drivers/tty/serial/8250/8250_aspeed_vuart.c b/drivers/tty/serial/8250/8250_aspeed_vuart.c
index 33a801353114..74a408d9db24 100644
--- a/drivers/tty/serial/8250/8250_aspeed_vuart.c
+++ b/drivers/tty/serial/8250/8250_aspeed_vuart.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  Serial Port driver for Aspeed VUART device
 *
 *    Copyright (C) 2016 Jeremy Kerr <jk@ozlabs.org>, IBM Corp.
 *    Copyright (C) 2006 Arnd Bergmann <arnd@arndb.de>, IBM Corp.
- *
- *  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.
 */
 #include <linux/device.h>
 #include <linux/module.h>
diff --git a/drivers/tty/serial/8250/8250_bcm2835aux.c b/drivers/tty/serial/8250/8250_bcm2835aux.c
index a23c7da42ea8..bd53661103eb 100644
--- a/drivers/tty/serial/8250/8250_bcm2835aux.c
+++ b/drivers/tty/serial/8250/8250_bcm2835aux.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Serial port driver for BCM2835AUX UART
 *
@@ -5,11 +6,6 @@
 *
 * Based on 8250_lpc18xx.c:
 * Copyright (C) 2015 Joachim Eastwood <manabian@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
 */
 #include <linux/clk.h>
diff --git a/drivers/tty/serial/8250/8250_boca.c b/drivers/tty/serial/8250/8250_boca.c
index a63b5998e383..a9b97c034653 100644
--- a/drivers/tty/serial/8250/8250_boca.c
+++ b/drivers/tty/serial/8250/8250_boca.c
@@ -1,10 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 *  Copyright (C) 2005 Russell King.
 *  Data taken from include/asm-i386/serial.h
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
 */
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
index d29b512a7d9f..d64afdd93872 100644
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  Universal/legacy driver for 8250/16550-type serial ports
 *
@@ -11,11 +12,6 @@
 *            userspace-configurable "phantom" ports
 *            "serial8250" platform devices
 *            serial8250_register_8250_port() ports
- *
- * 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.
 */
 #include <linux/module.h>
@@ -262,17 +258,17 @@ static void serial_unlink_irq_chain(struct uart_8250_port *up)
 * barely passable results for a 16550A.  (Although at the expense
 * of much CPU overhead).
 */
-static void serial8250_timeout(unsigned long data)
+static void serial8250_timeout(struct timer_list *t)
 {
-        struct uart_8250_port *up = (struct uart_8250_port *)data;
+        struct uart_8250_port *up = from_timer(up, t, timer);
        up->port.handle_irq(&up->port);
        mod_timer(&up->timer, jiffies + uart_poll_timeout(&up->port));
 }
-static void serial8250_backup_timeout(unsigned long data)
+static void serial8250_backup_timeout(struct timer_list *t)
 {
-        struct uart_8250_port *up = (struct uart_8250_port *)data;
+        struct uart_8250_port *up = from_timer(up, t, timer);
        unsigned int iir, ier = 0, lsr;
        unsigned long flags;
@@ -329,8 +325,7 @@ static int univ8250_setup_irq(struct uart_8250_port *up)
        if (up->bugs & UART_BUG_THRE) {
                pr_debug("ttyS%d - using backup timer\n", serial_index(port));
-                up->timer.function = serial8250_backup_timeout;
+                up->timer.function = (TIMER_FUNC_TYPE)serial8250_backup_timeout;
-                up->timer.data = (unsigned long)up;
                mod_timer(&up->timer, jiffies +
                          uart_poll_timeout(port) + HZ / 5);
        }
@@ -341,7 +336,6 @@ static int univ8250_setup_irq(struct uart_8250_port *up)
         * driver used to do this with IRQ0.
         */
        if (!port->irq) {
-                up->timer.data = (unsigned long)up;
                mod_timer(&up->timer, jiffies + uart_poll_timeout(port));
        } else
                retval = serial_link_irq_chain(up);
@@ -354,7 +348,7 @@ static void univ8250_release_irq(struct uart_8250_port *up)
        struct uart_port *port = &up->port;
        del_timer_sync(&up->timer);
-        up->timer.function = serial8250_timeout;
+        up->timer.function = (TIMER_FUNC_TYPE)serial8250_timeout;
        if (port->irq)
                serial_unlink_irq_chain(up);
 }
@@ -525,8 +519,7 @@ static void __init serial8250_isa_init_ports(void)
                        base_ops = port->ops;
                port->ops = &univ8250_port_ops;
-                init_timer(&up->timer);
+                timer_setup(&up->timer, serial8250_timeout, 0);
-                up->timer.function = serial8250_timeout;
                up->ops = &univ8250_driver_ops;
diff --git a/drivers/tty/serial/8250/8250_dma.c b/drivers/tty/serial/8250/8250_dma.c
index 26f17456b0d7..bfa1a857f3ff 100644
--- a/drivers/tty/serial/8250/8250_dma.c
+++ b/drivers/tty/serial/8250/8250_dma.c
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * 8250_dma.c - DMA Engine API support for 8250.c
 *
 * Copyright (C) 2013 Intel Corporation
- *
- * 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.
 */
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index 7e638997bfc2..5bb0c42c88dd 100644
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * Synopsys DesignWare 8250 driver.
 *
 * Copyright 2011 Picochip, Jamie Iles.
 * Copyright 2013 Intel Corporation
 *
- * 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.
- *
 * The Synopsys DesignWare 8250 has an extra feature whereby it detects if the
 * LCR is written whilst busy.  If it is, then a busy detect interrupt is
 * raised, the LCR needs to be rewritten and the uart status register read.
@@ -256,25 +252,31 @@ static void dw8250_set_termios(struct uart_port *p, struct ktermios *termios,
                               struct ktermios *old)
 {
        unsigned int baud = tty_termios_baud_rate(termios);
+        unsigned int target_rate, min_rate, max_rate;
        struct dw8250_data *d = p->private_data;
        long rate;
-        int ret;
+        int i, ret;
        if (IS_ERR(d->clk) || !old)
                goto out;
-        clk_disable_unprepare(d->clk);
+        /* Find a clk rate within +/-1.6% of an integer multiple of baudx16 */
-        rate = clk_round_rate(d->clk, baud * 16);
+        target_rate = baud * 16;
-        if (rate < 0)
+        min_rate = target_rate - (target_rate >> 6);
-                ret = rate;
+        max_rate = target_rate + (target_rate >> 6);
-        else if (rate == 0)
-                ret = -ENOENT;
-        else
-                ret = clk_set_rate(d->clk, rate);
-        clk_prepare_enable(d->clk);
-        if (!ret)
+        for (i = 1; i <= UART_DIV_MAX; i++) {
-                p->uartclk = rate;
+                rate = clk_round_rate(d->clk, i * target_rate);
+                if (rate >= i * min_rate && rate <= i * max_rate)
+                        break;
+        }
+        if (i <= UART_DIV_MAX) {
+                clk_disable_unprepare(d->clk);
+                ret = clk_set_rate(d->clk, rate);
+                clk_prepare_enable(d->clk);
+                if (!ret)
+                        p->uartclk = rate;
+        }
 out:
        p->status &= ~UPSTAT_AUTOCTS;
diff --git a/drivers/tty/serial/8250/8250_early.c b/drivers/tty/serial/8250/8250_early.c
index af72ec32e404..362c25ff188a 100644
--- a/drivers/tty/serial/8250/8250_early.c
+++ b/drivers/tty/serial/8250/8250_early.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Early serial console for 8250/16550 devices
 *
 * (c) Copyright 2004 Hewlett-Packard Development Company, L.P.
 *      Bjorn Helgaas <bjorn.helgaas@hp.com>
 *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
 * Based on the 8250.c serial driver, Copyright (C) 2001 Russell King,
 * and on early_printk.c by Andi Kleen.
 *
diff --git a/drivers/tty/serial/8250/8250_em.c b/drivers/tty/serial/8250/8250_em.c
index 0b6381214917..f6a86f2bc4e5 100644
--- a/drivers/tty/serial/8250/8250_em.c
+++ b/drivers/tty/serial/8250/8250_em.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Renesas Emma Mobile 8250 driver
 *
 *  Copyright (C) 2012 Magnus Damm
- *
- * 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
- *
- * 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
 */
 #include <linux/device.h>
diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c
index c55624703fdf..a402878c9f30 100644
--- a/drivers/tty/serial/8250/8250_exar.c
+++ b/drivers/tty/serial/8250/8250_exar.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 *  Probe module for 8250/16550-type Exar chips PCI serial ports.
 *
 *  Based on drivers/tty/serial/8250/8250_pci.c,
 *
 *  Copyright (C) 2017 Sudip Mukherjee, All Rights Reserved.
- *
- * 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.
 */
 #include <linux/acpi.h>
 #include <linux/dmi.h>
diff --git a/drivers/tty/serial/8250/8250_exar_st16c554.c b/drivers/tty/serial/8250/8250_exar_st16c554.c
index 3a7cb8262bb9..933811ebfaac 100644
--- a/drivers/tty/serial/8250/8250_exar_st16c554.c
+++ b/drivers/tty/serial/8250/8250_exar_st16c554.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 *  Written by Paul B Schroeder < pschroeder "at" uplogix "dot" com >
 *  Based on 8250_boca.
 *
 *  Copyright (C) 2005 Russell King.
 *  Data taken from include/asm-i386/serial.h
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
 */
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/tty/serial/8250/8250_fintek.c b/drivers/tty/serial/8250/8250_fintek.c
index e500f7dd2470..79a4958b3f5c 100644
--- a/drivers/tty/serial/8250/8250_fintek.c
+++ b/drivers/tty/serial/8250/8250_fintek.c
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 *  Probe for F81216A LPC to 4 UART
 *
 *  Copyright (C) 2014-2016 Ricardo Ribalda, Qtechnology A/S
- *
- *
- * 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.
 */
 #include <linux/module.h>
 #include <linux/pci.h>
@@ -40,6 +36,16 @@
 #define IRQ_LEVEL_LOW   0
 #define IRQ_EDGE_HIGH   BIT(5)
+/*
+ * F81216H clock source register, the value and mask is the same with F81866,
+ * but it's on F0h.
+ *
+ * Clock speeds for UART (register F0h)
+ * 00: 1.8432MHz.
+ * 01: 18.432MHz.
+ * 10: 24MHz.
+ * 11: 14.769MHz.
+ */
 #define RS485  0xF0
 #define RTS_INVERT BIT(5)
 #define RS485_URA BIT(4)
@@ -118,6 +124,9 @@ static int fintek_8250_enter_key(u16 base_port, u8 key)
        if (!request_muxed_region(base_port, 2, "8250_fintek"))
                return -EBUSY;
+        /* Force to deactive all SuperIO in this base_port */
+        outb(EXIT_KEY, base_port + ADDR_PORT);
        outb(key, base_port + ADDR_PORT);
        outb(key, base_port + ADDR_PORT);
        return 0;
@@ -188,14 +197,27 @@ static int fintek_8250_rs485_config(struct uart_port *port,
        if (!pdata)
                return -EINVAL;
-        if (rs485->flags & SER_RS485_ENABLED)
+        /* Hardware do not support same RTS level on send and receive */
+        if (!(rs485->flags & SER_RS485_RTS_ON_SEND) ==
+                        !(rs485->flags & SER_RS485_RTS_AFTER_SEND))
+                return -EINVAL;
+        if (rs485->flags & SER_RS485_ENABLED) {
                memset(rs485->padding, 0, sizeof(rs485->padding));
-        else
+                config |= RS485_URA;
+        } else {
                memset(rs485, 0, sizeof(*rs485));
+        }
        rs485->flags &= SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND |
                        SER_RS485_RTS_AFTER_SEND;
+        /* Only the first port supports delays */
+        if (pdata->index) {
+                rs485->delay_rts_before_send = 0;
+                rs485->delay_rts_after_send = 0;
+        }
        if (rs485->delay_rts_before_send) {
                rs485->delay_rts_before_send = 1;
                config |= TXW4C_IRA;
@@ -206,12 +228,6 @@ static int fintek_8250_rs485_config(struct uart_port *port,
                config |= RXW4C_IRA;
        }
-        if ((!!(rs485->flags & SER_RS485_RTS_ON_SEND)) ==
-                        (!!(rs485->flags & SER_RS485_RTS_AFTER_SEND)))
-                rs485->flags &= SER_RS485_ENABLED;
-        else
-                config |= RS485_URA;
        if (rs485->flags & SER_RS485_RTS_ON_SEND)
                config |= RTS_INVERT;
@@ -280,13 +296,91 @@ static void fintek_8250_goto_highspeed(struct uart_8250_port *uart,
                        F81866_UART_CLK_MASK,
                        F81866_UART_CLK_14_769MHZ);
-                        uart->port.uartclk = 921600 * 16;
+                uart->port.uartclk = 921600 * 16;
                break;
        default: /* leave clock speed untouched */
                break;
        }
 }
+void fintek_8250_set_termios(struct uart_port *port, struct ktermios *termios,
+                        struct ktermios *old)
+{
+        struct fintek_8250 *pdata = port->private_data;
+        unsigned int baud = tty_termios_baud_rate(termios);
+        int i;
+        u8 reg;
+        static u32 baudrate_table[] = {115200, 921600, 1152000, 1500000};
+        static u8 clock_table[] = { F81866_UART_CLK_1_8432MHZ,
+                        F81866_UART_CLK_14_769MHZ, F81866_UART_CLK_18_432MHZ,
+                        F81866_UART_CLK_24MHZ };
+        /*
+         * We'll use serial8250_do_set_termios() for baud = 0, otherwise It'll
+         * crash on baudrate_table[i] % baud with "division by zero".
+         */
+        if (!baud)
+                goto exit;
+        switch (pdata->pid) {
+        case CHIP_ID_F81216H:
+                reg = RS485;
+                break;
+        case CHIP_ID_F81866:
+                reg = F81866_UART_CLK;
+                break;
+        default:
+                /* Don't change clocksource with unknown PID */
+                dev_warn(port->dev,
+                        "%s: pid: %x Not support. use default set_termios.\n",
+                        __func__, pdata->pid);
+                goto exit;
+        }
+        for (i = 0; i < ARRAY_SIZE(baudrate_table); ++i) {
+                if (baud > baudrate_table[i] || baudrate_table[i] % baud != 0)
+                        continue;
+                if (port->uartclk == baudrate_table[i] * 16)
+                        break;
+                if (fintek_8250_enter_key(pdata->base_port, pdata->key))
+                        continue;
+                port->uartclk = baudrate_table[i] * 16;
+                sio_write_reg(pdata, LDN, pdata->index);
+                sio_write_mask_reg(pdata, reg, F81866_UART_CLK_MASK,
+                                clock_table[i]);
+                fintek_8250_exit_key(pdata->base_port);
+                break;
+        }
+        if (i == ARRAY_SIZE(baudrate_table)) {
+                baud = tty_termios_baud_rate(old);
+                tty_termios_encode_baud_rate(termios, baud, baud);
+        }
+exit:
+        serial8250_do_set_termios(port, termios, old);
+}
+static void fintek_8250_set_termios_handler(struct uart_8250_port *uart)
+{
+        struct fintek_8250 *pdata = uart->port.private_data;
+        switch (pdata->pid) {
+        case CHIP_ID_F81216H:
+        case CHIP_ID_F81866:
+                uart->port.set_termios = fintek_8250_set_termios;
+                break;
+        default:
+                break;
+        }
+}
 static int probe_setup_port(struct fintek_8250 *pdata,
                                        struct uart_8250_port *uart)
 {
@@ -373,6 +467,7 @@ int fintek_8250_probe(struct uart_8250_port *uart)
        memcpy(pdata, &probe_data, sizeof(probe_data));
        uart->port.private_data = pdata;
        fintek_8250_set_rs485_handler(uart);
+        fintek_8250_set_termios_handler(uart);
        return 0;
 }
diff --git a/drivers/tty/serial/8250/8250_fourport.c b/drivers/tty/serial/8250/8250_fourport.c
index 4045180a8cfc..3215b9b7afde 100644
--- a/drivers/tty/serial/8250/8250_fourport.c
+++ b/drivers/tty/serial/8250/8250_fourport.c
@@ -1,10 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 *  Copyright (C) 2005 Russell King.
 *  Data taken from include/asm-i386/serial.h
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
 */
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/tty/serial/8250/8250_fsl.c b/drivers/tty/serial/8250/8250_fsl.c
index 910bfee5a88b..6640a4c7ddd1 100644
--- a/drivers/tty/serial/8250/8250_fsl.c
+++ b/drivers/tty/serial/8250/8250_fsl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/serial_reg.h>
 #include <linux/serial_8250.h>
@@ -6,10 +7,6 @@
 /*
 * Freescale 16550 UART "driver", Copyright (C) 2011 Paul Gortmaker.
 *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
 * This isn't a full driver; it just provides an alternate IRQ
 * handler to deal with an errata.  Everything else is just
 * using the bog standard 8250 support.
diff --git a/drivers/tty/serial/8250/8250_gsc.c b/drivers/tty/serial/8250/8250_gsc.c
index df2931e1e086..0809ae2aa9b1 100644
--- a/drivers/tty/serial/8250/8250_gsc.c
+++ b/drivers/tty/serial/8250/8250_gsc.c
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *      Serial Device Initialisation for Lasi/Asp/Wax/Dino
 *
 *      (c) Copyright Matthew Wilcox <willy@debian.org> 2001-2002
- *
- *      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.
 */
 #include <linux/errno.h>
diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/serial/8250/8250_hp300.c
index 115190b7962a..3012ea03d22c 100644
--- a/drivers/tty/serial/8250/8250_hp300.c
+++ b/drivers/tty/serial/8250/8250_hp300.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Driver for the 98626/98644/internal serial interface on hp300/hp400
 * (based on the National Semiconductor INS8250/NS16550AF/WD16C552 UARTs)
diff --git a/drivers/tty/serial/8250/8250_hub6.c b/drivers/tty/serial/8250/8250_hub6.c
index 27124e21eb96..273f59b9bca5 100644
--- a/drivers/tty/serial/8250/8250_hub6.c
+++ b/drivers/tty/serial/8250/8250_hub6.c
@@ -1,10 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 *  Copyright (C) 2005 Russell King.
 *  Data taken from include/asm-i386/serial.h
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
 */
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/tty/serial/8250/8250_ingenic.c b/drivers/tty/serial/8250/8250_ingenic.c
index 464389b28900..6af84900870e 100644
--- a/drivers/tty/serial/8250/8250_ingenic.c
+++ b/drivers/tty/serial/8250/8250_ingenic.c
@@ -1,17 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * Copyright (C) 2010 Lars-Peter Clausen <lars@metafoo.de>
 * Copyright (C) 2015 Imagination Technologies
 *
 * Ingenic SoC UART support
- *
- * 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.
- *
- * 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.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include <linux/clk.h>
diff --git a/drivers/tty/serial/8250/8250_lpc18xx.c b/drivers/tty/serial/8250/8250_lpc18xx.c
index 99cd478851ff..eddf119374e1 100644
--- a/drivers/tty/serial/8250/8250_lpc18xx.c
+++ b/drivers/tty/serial/8250/8250_lpc18xx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Serial port driver for NXP LPC18xx/43xx UART
 *
@@ -6,11 +7,6 @@
 * Based on 8250_mtk.c:
 * Copyright (c) 2014 MundoReader S.L.
 * Matthias Brugger <matthias.bgg@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
 */
 #include <linux/clk.h>
diff --git a/drivers/tty/serial/8250/8250_lpss.c b/drivers/tty/serial/8250/8250_lpss.c
index 7dddd7e6a01c..98dbc796353f 100644
--- a/drivers/tty/serial/8250/8250_lpss.c
+++ b/drivers/tty/serial/8250/8250_lpss.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * 8250_lpss.c - Driver for UART on Intel Braswell and various other Intel SoCs
 *
 * Copyright (C) 2016 Intel Corporation
 * Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
 */
 #include <linux/bitops.h>
diff --git a/drivers/tty/serial/8250/8250_mid.c b/drivers/tty/serial/8250/8250_mid.c
index ec957cce8c9a..efa0515139f8 100644
--- a/drivers/tty/serial/8250/8250_mid.c
+++ b/drivers/tty/serial/8250/8250_mid.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * 8250_mid.c - Driver for UART on Intel Penwell and various other Intel SOCs
 *
 * Copyright (C) 2015 Intel Corporation
 * Author: Heikki Krogerus <heikki.krogerus@linux.intel.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
 */
 #include <linux/bitops.h>
@@ -23,10 +20,11 @@
 #define PCI_DEVICE_ID_INTEL_PNW_UART2   0x081c
 #define PCI_DEVICE_ID_INTEL_PNW_UART3   0x081d
 #define PCI_DEVICE_ID_INTEL_TNG_UART    0x1191
+#define PCI_DEVICE_ID_INTEL_CDF_UART    0x18d8
 #define PCI_DEVICE_ID_INTEL_DNV_UART    0x19d8
 /* Intel MID Specific registers */
-#define INTEL_MID_UART_DNV_FISR         0x08
+#define INTEL_MID_UART_FISR             0x08
 #define INTEL_MID_UART_PS               0x30
 #define INTEL_MID_UART_MUL              0x34
 #define INTEL_MID_UART_DIV              0x38
@@ -130,7 +128,7 @@ static int dnv_handle_irq(struct uart_port *p)
 {
        struct mid8250 *mid = p->private_data;
        struct uart_8250_port *up = up_to_u8250p(p);
-        unsigned int fisr = serial_port_in(p, INTEL_MID_UART_DNV_FISR);
+        unsigned int fisr = serial_port_in(p, INTEL_MID_UART_FISR);
        u32 status;
        int ret = 0;
        int err;
@@ -377,6 +375,7 @@ static const struct pci_device_id pci_ids[] = {
        MID_DEVICE(PCI_DEVICE_ID_INTEL_PNW_UART2, pnw_board),
        MID_DEVICE(PCI_DEVICE_ID_INTEL_PNW_UART3, pnw_board),
        MID_DEVICE(PCI_DEVICE_ID_INTEL_TNG_UART, tng_board),
+        MID_DEVICE(PCI_DEVICE_ID_INTEL_CDF_UART, dnv_board),
        MID_DEVICE(PCI_DEVICE_ID_INTEL_DNV_UART, dnv_board),
        { },
 };
diff --git a/drivers/tty/serial/8250/8250_moxa.c b/drivers/tty/serial/8250/8250_moxa.c
index d5069b2d4d79..1ee4cd94d4fa 100644
--- a/drivers/tty/serial/8250/8250_moxa.c
+++ b/drivers/tty/serial/8250/8250_moxa.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * 8250_moxa.c - MOXA Smartio/Industio MUE multiport serial driver.
 *
 * Author: Mathieu OTHACEHE <m.othacehe@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
 */
 #include <linux/module.h>
diff --git a/drivers/tty/serial/8250/8250_mtk.c b/drivers/tty/serial/8250/8250_mtk.c
index fb45770d47aa..dd5e1cede2b5 100644
--- a/drivers/tty/serial/8250/8250_mtk.c
+++ b/drivers/tty/serial/8250/8250_mtk.c
@@ -1,18 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * Mediatek 8250 driver.
 *
 * Copyright (c) 2014 MundoReader S.L.
 * Author: Matthias Brugger <matthias.bgg@gmail.com>
- *
- * 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.
 */
 #include <linux/clk.h>
 #include <linux/io.h>
@@ -61,7 +52,7 @@ mtk8250_set_termios(struct uart_port *port, struct ktermios *termios,
         * registers to their default values.
         */
        baud = uart_get_baud_rate(port, termios, old,
-                                  port->uartclk / 16 / 0xffff,
+                                  port->uartclk / 16 / UART_DIV_MAX,
                                  port->uartclk);
        if (baud <= 115200) {
diff --git a/drivers/tty/serial/8250/8250_of.c b/drivers/tty/serial/8250/8250_of.c
index 1222c005fb98..1e67a7e4a5fd 100644
--- a/drivers/tty/serial/8250/8250_of.c
+++ b/drivers/tty/serial/8250/8250_of.c
@@ -1,13 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  Serial Port driver for Open Firmware platform devices
 *
 *    Copyright (C) 2006 Arnd Bergmann <arnd@arndb.de>, IBM Corp.
- *
- *  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.
- *
 */
 #include <linux/console.h>
 #include <linux/module.h>
diff --git a/drivers/tty/serial/8250/8250_omap.c b/drivers/tty/serial/8250/8250_omap.c
index 833771bca0a5..bd40ba402410 100644
--- a/drivers/tty/serial/8250/8250_omap.c
+++ b/drivers/tty/serial/8250/8250_omap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * 8250-core based driver for the OMAP internal UART
 *
@@ -199,7 +200,7 @@ static void omap_8250_get_divisor(struct uart_port *port, unsigned int baud,
         * Old custom speed handling.
         */
        if (baud == 38400 && (port->flags & UPF_SPD_MASK) == UPF_SPD_CUST) {
-                priv->quot = port->custom_divisor & 0xffff;
+                priv->quot = port->custom_divisor & UART_DIV_MAX;
                /*
                 * I assume that nobody is using this. But hey, if somebody
                 * would like to specify the divisor _and_ the mode then the
@@ -358,7 +359,7 @@ static void omap_8250_set_termios(struct uart_port *port,
         * Ask the core to calculate the divisor for us.
         */
        baud = uart_get_baud_rate(port, termios, old,
-                                  port->uartclk / 16 / 0xffff,
+                                  port->uartclk / 16 / UART_DIV_MAX,
                                  port->uartclk / 13);
        omap_8250_get_divisor(port, baud, priv);
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 0c101a7470b0..b7e0e3416641 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 *  Probe module for 8250/16550-type PCI serial ports.
 *
 *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
 *
 *  Copyright (C) 2001 Russell King, All Rights Reserved.
- *
- * 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.
 */
 #undef DEBUG
 #include <linux/module.h>
@@ -3368,6 +3365,7 @@ static const struct pci_device_id blacklist[] = {
        { PCI_VDEVICE(INTEL, 0x081c), },
        { PCI_VDEVICE(INTEL, 0x081d), },
        { PCI_VDEVICE(INTEL, 0x1191), },
+        { PCI_VDEVICE(INTEL, 0x18d8), },
        { PCI_VDEVICE(INTEL, 0x19d8), },
        /* Intel platforms with DesignWare UART */
diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c
index 34f05ed78b68..431e69a5a6a0 100644
--- a/drivers/tty/serial/8250/8250_pnp.c
+++ b/drivers/tty/serial/8250/8250_pnp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 *  Probe for 8250/16550-type ISAPNP serial ports.
 *
@@ -6,10 +7,6 @@
 *  Copyright (C) 2001 Russell King, All Rights Reserved.
 *
 *  Ported to the Linux PnP Layer - (C) Adam Belay.
- *
- * 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.
 */
 #include <linux/module.h>
 #include <linux/pci.h>
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index f0cc04f62b67..11434551ac0a 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  Base port operations for 8250/16550-type serial ports
 *
 *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
 *  Split from 8250_core.c, Copyright (C) 2001 Russell King.
 *
- * 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.
- *
 * A note about mapbase / membase
 *
 *  mapbase is the physical address of the IO port.
@@ -1516,7 +1512,6 @@ static inline void __stop_tx(struct uart_8250_port *p)
                        return;
                em485->active_timer = NULL;
-                hrtimer_cancel(&em485->start_tx_timer);
                __stop_tx_rs485(p);
        }
@@ -1580,8 +1575,6 @@ static inline void start_tx_rs485(struct uart_port *port)
                serial8250_stop_rx(&up->port);
        em485->active_timer = NULL;
-        if (hrtimer_is_queued(&em485->stop_tx_timer))
-                hrtimer_cancel(&em485->stop_tx_timer);
        mcr = serial8250_in_MCR(up);
        if (!!(up->port.rs485.flags & SER_RS485_RTS_ON_SEND) !=
@@ -2586,8 +2579,11 @@ static void serial8250_set_divisor(struct uart_port *port, unsigned int baud,
        serial_dl_write(up, quot);
        /* XR17V35x UARTs have an extra fractional divisor register (DLD) */
-        if (up->port.type == PORT_XR17V35X)
+        if (up->port.type == PORT_XR17V35X) {
+                /* Preserve bits not related to baudrate; DLD[7:4]. */
+                quot_frac |= serial_port_in(port, 0x2) & 0xf0;
                serial_port_out(port, 0x2, quot_frac);
+        }
 }
 static unsigned int serial8250_get_baud_rate(struct uart_port *port,
@@ -2601,7 +2597,7 @@ static unsigned int serial8250_get_baud_rate(struct uart_port *port,
         * causing transmission errors.
         */
        return uart_get_baud_rate(port, termios, old,
-                                  port->uartclk / 16 / 0xffff,
+                                  port->uartclk / 16 / UART_DIV_MAX,
                                  port->uartclk);
 }
diff --git a/drivers/tty/serial/8250/8250_pxa.c b/drivers/tty/serial/8250/8250_pxa.c
index 4d68731af534..b9bcbe20a2be 100644
--- a/drivers/tty/serial/8250/8250_pxa.c
+++ b/drivers/tty/serial/8250/8250_pxa.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  drivers/tty/serial/8250/8250_pxa.c -- driver for PXA on-board UARTS
 *  Copyright:  (C) 2013 Sergei Ianovich <ynvich@gmail.com>
@@ -7,12 +8,6 @@
 *  Copyright:  (C) 2003 Monta Vista Software, Inc.
 *
 *  Based on drivers/serial/8250.c by Russell King.
- *
- * 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.
- *
 */
 #include <linux/device.h>
diff --git a/drivers/tty/serial/8250/8250_uniphier.c b/drivers/tty/serial/8250/8250_uniphier.c
index 8a10b10e27aa..45ef506293ae 100644
--- a/drivers/tty/serial/8250/8250_uniphier.c
+++ b/drivers/tty/serial/8250/8250_uniphier.c
@@ -1,15 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * 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.
 */
 #include <linux/clk.h>
diff --git a/drivers/tty/serial/8250/serial_cs.c b/drivers/tty/serial/8250/serial_cs.c
index 933c2688dd7e..9963a766dcfb 100644
--- a/drivers/tty/serial/8250/serial_cs.c
+++ b/drivers/tty/serial/8250/serial_cs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1)
 /*======================================================================
    A driver for PCMCIA serial devices
diff --git a/drivers/tty/serial/altera_jtaguart.c b/drivers/tty/serial/altera_jtaguart.c
index 0475f5d261ce..c90e503d6b57 100644
--- a/drivers/tty/serial/altera_jtaguart.c
+++ b/drivers/tty/serial/altera_jtaguart.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * altera_jtaguart.c -- Altera JTAG UART driver
 *
@@ -6,11 +7,6 @@
 * (C) Copyright 2003-2007, Greg Ungerer <gerg@snapgear.com>
 * (C) Copyright 2008, Thomas Chou <thomas@wytron.com.tw>
 * (C) Copyright 2010, Tobias Klauser <tklauser@distanz.ch>
- *
- * 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.
 */
 #include <linux/kernel.h>
diff --git a/drivers/tty/serial/altera_uart.c b/drivers/tty/serial/altera_uart.c
index 3e4b717670d7..b88b05f8e81e 100644
--- a/drivers/tty/serial/altera_uart.c
+++ b/drivers/tty/serial/altera_uart.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * altera_uart.c -- Altera UART driver
 *
@@ -6,11 +7,6 @@
 * (C) Copyright 2003-2007, Greg Ungerer <gerg@snapgear.com>
 * (C) Copyright 2008, Thomas Chou <thomas@wytron.com.tw>
 * (C) Copyright 2010, Tobias Klauser <tklauser@distanz.ch>
- *
- * 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.
 */
 #include <linux/kernel.h>
@@ -288,10 +284,10 @@ static irqreturn_t altera_uart_interrupt(int irq, void *data)
        return IRQ_RETVAL(isr);
 }
-static void altera_uart_timer(unsigned long data)
+static void altera_uart_timer(struct timer_list *t)
 {
-        struct uart_port *port = (void *)data;
+        struct altera_uart *pp = from_timer(pp, t, tmr);
-        struct altera_uart *pp = container_of(port, struct altera_uart, port);
+        struct uart_port *port = &pp->port;
        altera_uart_interrupt(0, port);
        mod_timer(&pp->tmr, jiffies + uart_poll_timeout(port));
@@ -314,7 +310,7 @@ static int altera_uart_startup(struct uart_port *port)
        int ret;
        if (!port->irq) {
-                setup_timer(&pp->tmr, altera_uart_timer, (unsigned long)port);
+                timer_setup(&pp->tmr, altera_uart_timer, 0);
                mod_timer(&pp->tmr, jiffies + uart_poll_timeout(port));
                return 0;
        }
diff --git a/drivers/tty/serial/amba-pl010.c b/drivers/tty/serial/amba-pl010.c
index 9ec4b8d2879f..2c37d11726ab 100644
--- a/drivers/tty/serial/amba-pl010.c
+++ b/drivers/tty/serial/amba-pl010.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  Driver for AMBA serial ports
 *
@@ -6,20 +7,6 @@
 *  Copyright 1999 ARM Limited
 *  Copyright (C) 2000 Deep Blue Solutions Ltd.
 *
- * 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
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));
+                        timer_setup(&uap->dmarx.timer, pl011_dma_rx_poll, 0);
-                        uap->dmarx.timer.function = pl011_dma_rx_poll;
-                        uap->dmarx.timer.data = (unsigned long)uap;
                        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) {
diff --git a/drivers/tty/serial/apbuart.c b/drivers/tty/serial/apbuart.c
index dd60ed96a0ad..60cd133ffbbc 100644
--- a/drivers/tty/serial/apbuart.c
+++ b/drivers/tty/serial/apbuart.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 *  Driver for GRLIB serial ports (APBUART)
 *
diff --git a/drivers/tty/serial/ar933x_uart.c b/drivers/tty/serial/ar933x_uart.c
index decc7f3c1ab2..db5df3d54818 100644
--- a/drivers/tty/serial/ar933x_uart.c
+++ b/drivers/tty/serial/ar933x_uart.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 *  Atheros AR933X SoC built-in UART driver
 *
 *  Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
 *
 *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
- *
- *  This program is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License version 2 as published
- *  by the Free Software Foundation.
 */
 #include <linux/module.h>
diff --git a/drivers/tty/serial/arc_uart.c b/drivers/tty/serial/arc_uart.c
index 77fe306690c4..2599f9ecccfe 100644
--- a/drivers/tty/serial/arc_uart.c
+++ b/drivers/tty/serial/arc_uart.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * ARC On-Chip(fpga) UART Driver
 *
 * Copyright (C) 2010-2012 Synopsys, Inc. (www.synopsys.com)
 *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
 * vineetg: July 10th 2012
 *  -Decoupled the driver from arch/arc
 *    +Using platform_get_resource() for irq/membase (thx to bfin_uart.c)
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index 7551cab438ff..efa25611ca0c 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  Driver for Atmel AT91 Serial ports
 *  Copyright (C) 2003 Rick Bronson
@@ -6,21 +7,6 @@
 *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
 *
 *  DMA support added by Chip Coldwell.
- *
- * 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
- *
 */
 #include <linux/tty.h>
 #include <linux/ioport.h>
@@ -171,6 +157,7 @@ struct atmel_uart_port {
        bool                    has_hw_timer;
        struct timer_list       uart_timer;
+        bool                    tx_stopped;
        bool                    suspended;
        unsigned int            pending;
        unsigned int            pending_status;
@@ -380,6 +367,10 @@ static int atmel_config_rs485(struct uart_port *port,
 */
 static u_int atmel_tx_empty(struct uart_port *port)
 {
+        struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
+        if (atmel_port->tx_stopped)
+                return TIOCSER_TEMT;
        return (atmel_uart_readl(port, ATMEL_US_CSR) & ATMEL_US_TXEMPTY) ?
                TIOCSER_TEMT :
                0;
@@ -485,6 +476,7 @@ static void atmel_stop_tx(struct uart_port *port)
         * is fully transmitted.
         */
        atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXDIS);
+        atmel_port->tx_stopped = true;
        /* Disable interrupts */
        atmel_uart_writel(port, ATMEL_US_IDR, atmel_port->tx_done_mask);
@@ -521,6 +513,7 @@ static void atmel_start_tx(struct uart_port *port)
        /* re-enable the transmitter */
        atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXEN);
+        atmel_port->tx_stopped = false;
 }
 /*
@@ -1178,10 +1171,11 @@ chan_err:
        return -EINVAL;
 }
-static void atmel_uart_timer_callback(unsigned long data)
+static void atmel_uart_timer_callback(struct timer_list *t)
 {
-        struct uart_port *port = (void *)data;
+        struct atmel_uart_port *atmel_port = from_timer(atmel_port, t,
-        struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
+                                                        uart_timer);
+        struct uart_port *port = &atmel_port->uart;
        if (!atomic_read(&atmel_port->tasklet_shutdown)) {
                tasklet_schedule(&atmel_port->tasklet_rx);
@@ -1667,29 +1661,6 @@ static void atmel_init_property(struct atmel_uart_port *atmel_port,
        }
 }
-static void atmel_init_rs485(struct uart_port *port,
-                                struct platform_device *pdev)
-{
-        struct device_node *np = pdev->dev.of_node;
-        struct serial_rs485 *rs485conf = &port->rs485;
-        u32 rs485_delay[2];
-        /* rs485 properties */
-        if (of_property_read_u32_array(np, "rs485-rts-delay",
-                                       rs485_delay, 2) == 0) {
-                rs485conf->delay_rts_before_send = rs485_delay[0];
-                rs485conf->delay_rts_after_send = rs485_delay[1];
-                rs485conf->flags = 0;
-        }
-        if (of_get_property(np, "rs485-rx-during-tx", NULL))
-                rs485conf->flags |= SER_RS485_RX_DURING_TX;
-        if (of_get_property(np, "linux,rs485-enabled-at-boot-time", NULL))
-                rs485conf->flags |= SER_RS485_ENABLED;
-}
 static void atmel_set_ops(struct uart_port *port)
 {
        struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
@@ -1866,10 +1837,9 @@ static int atmel_startup(struct uart_port *port)
        atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_RSTSTA | ATMEL_US_RSTRX);
        /* enable xmit & rcvr */
        atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXEN | ATMEL_US_RXEN);
+        atmel_port->tx_stopped = false;
-        setup_timer(&atmel_port->uart_timer,
+        timer_setup(&atmel_port->uart_timer, atmel_uart_timer_callback, 0);
-                        atmel_uart_timer_callback,
-                        (unsigned long)port);
        if (atmel_use_pdc_rx(port)) {
                /* set UART timeout */
@@ -2122,6 +2092,7 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios,
        /* disable receiver and transmitter */
        atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXDIS | ATMEL_US_RXDIS);
+        atmel_port->tx_stopped = true;
        /* mode */
        if (port->rs485.flags & SER_RS485_ENABLED) {
@@ -2207,6 +2178,7 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios,
        atmel_uart_writel(port, ATMEL_US_BRGR, quot);
        atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_RSTSTA | ATMEL_US_RSTRX);
        atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXEN | ATMEL_US_RXEN);
+        atmel_port->tx_stopped = false;
        /* restore interrupts */
        atmel_uart_writel(port, ATMEL_US_IER, imr);
@@ -2373,7 +2345,7 @@ static int atmel_init_port(struct atmel_uart_port *atmel_port,
        atmel_init_property(atmel_port, pdev);
        atmel_set_ops(port);
-        atmel_init_rs485(port, pdev);
+        of_get_rs485_mode(pdev->dev.of_node, &port->rs485);
        port->iotype            = UPIO_MEM;
        port->flags             = UPF_BOOT_AUTOCONF | UPF_IOREMAP;
@@ -2450,6 +2422,7 @@ static void atmel_console_write(struct console *co, const char *s, u_int count)
        /* Make sure that tx path is actually able to send characters */
        atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXEN);
+        atmel_port->tx_stopped = false;
        uart_console_write(port, s, count, atmel_console_putchar);
@@ -2511,6 +2484,7 @@ static int __init atmel_console_setup(struct console *co, char *options)
 {
        int ret;
        struct uart_port *port = &atmel_ports[co->index].uart;
+        struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
        int baud = 115200;
        int bits = 8;
        int parity = 'n';
@@ -2528,6 +2502,7 @@ static int __init atmel_console_setup(struct console *co, char *options)
        atmel_uart_writel(port, ATMEL_US_IDR, -1);
        atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_RSTSTA | ATMEL_US_RSTRX);
        atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXEN | ATMEL_US_RXEN);
+        atmel_port->tx_stopped = false;
        if (options)
                uart_parse_options(options, &baud, &parity, &bits, &flow);
diff --git a/drivers/tty/serial/atmel_serial.h b/drivers/tty/serial/atmel_serial.h
index bd2560502f3c..ba3a2437cde4 100644
--- a/drivers/tty/serial/atmel_serial.h
+++ b/drivers/tty/serial/atmel_serial.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * include/linux/atmel_serial.h
 *
@@ -6,11 +7,6 @@
 *
 * USART registers.
 * Based on AT91RM9200 datasheet revision E.
- *
- * 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.
 */
 #ifndef ATMEL_SERIAL_H
diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c
index 8c48c3784831..9d1b7bf7378c 100644
--- a/drivers/tty/serial/bcm63xx_uart.c
+++ b/drivers/tty/serial/bcm63xx_uart.c
@@ -1,8 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
 * Derived from many drivers using generic_serial interface.
 *
 * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
diff --git a/drivers/tty/serial/bfin_sport_uart.c b/drivers/tty/serial/bfin_sport_uart.c
index 6b03fb12cd19..4ccca5d22f4f 100644
--- a/drivers/tty/serial/bfin_sport_uart.c
+++ b/drivers/tty/serial/bfin_sport_uart.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * Blackfin On-Chip Sport Emulated UART Driver
 *
 * Copyright 2006-2009 Analog Devices Inc.
 *
 * Enter bugs at http://blackfin.uclinux.org/
- *
- * Licensed under the GPL-2 or later.
 */
 /*
@@ -584,7 +583,7 @@ static void sport_set_termios(struct uart_port *port,
        spin_unlock_irqrestore(&up->port.lock, flags);
 }
-struct uart_ops sport_uart_ops = {
+static const struct uart_ops sport_uart_ops = {
        .tx_empty       = sport_tx_empty,
        .set_mctrl      = sport_set_mctrl,
        .get_mctrl      = sport_get_mctrl,
diff --git a/drivers/tty/serial/bfin_sport_uart.h b/drivers/tty/serial/bfin_sport_uart.h
index e4510ea135ce..4b12f45d6580 100644
--- a/drivers/tty/serial/bfin_sport_uart.h
+++ b/drivers/tty/serial/bfin_sport_uart.h
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * Blackfin On-Chip Sport Emulated UART Driver
 *
 * Copyright 2006-2008 Analog Devices Inc.
 *
 * Enter bugs at http://blackfin.uclinux.org/
- *
- * Licensed under the GPL-2 or later.
 */
 /*
diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c
index 293ecbb00684..4755fa696321 100644
--- a/drivers/tty/serial/bfin_uart.c
+++ b/drivers/tty/serial/bfin_uart.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * Blackfin On-Chip Serial Driver
 *
 * Copyright 2006-2011 Analog Devices Inc.
 *
 * Enter bugs at http://blackfin.uclinux.org/
- *
- * Licensed under the GPL-2 or later.
 */
 #if defined(CONFIG_SERIAL_BFIN_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
@@ -456,8 +455,9 @@ static void bfin_serial_dma_rx_chars(struct bfin_serial_port *uart)
        tty_flip_buffer_push(&uart->port.state->port);
 }
-void bfin_serial_rx_dma_timeout(struct bfin_serial_port *uart)
+void bfin_serial_rx_dma_timeout(struct timer_list *t)
 {
+        struct bfin_serial_port *uart = from_timer(uart, t, rx_dma_timer);
        int x_pos, pos;
        unsigned long flags;
@@ -624,8 +624,6 @@ static int bfin_serial_startup(struct uart_port *port)
        set_dma_start_addr(uart->rx_dma_channel, (unsigned long)uart->rx_dma_buf.buf);
        enable_dma(uart->rx_dma_channel);
-        uart->rx_dma_timer.data = (unsigned long)(uart);
-        uart->rx_dma_timer.function = (void *)bfin_serial_rx_dma_timeout;
        uart->rx_dma_timer.expires = jiffies + DMA_RX_FLUSH_JIFFIES;
        add_timer(&(uart->rx_dma_timer));
 #else
@@ -1316,7 +1314,7 @@ static int bfin_serial_probe(struct platform_device *pdev)
                }
                uart->rx_dma_channel = res->start;
-                init_timer(&(uart->rx_dma_timer));
+                timer_setup(&uart->rx_dma_timer, bfin_serial_rx_dma_timeout, 0);
 #endif
 #if defined(SERIAL_BFIN_CTSRTS) || \
diff --git a/drivers/tty/serial/clps711x.c b/drivers/tty/serial/clps711x.c
index ac1328629baa..98f193a83392 100644
--- a/drivers/tty/serial/clps711x.c
+++ b/drivers/tty/serial/clps711x.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  Driver for CLPS711x serial ports
 *
@@ -5,11 +6,6 @@
 *
 *  Copyright 1999 ARM Limited
 *  Copyright (C) 2000 Deep Blue Solutions Ltd.
- *
- * 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.
 */
 #if defined(CONFIG_SERIAL_CLPS711X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart.h b/drivers/tty/serial/cpm_uart/cpm_uart.h
index 0ad027b95873..9f175a92fb5d 100644
--- a/drivers/tty/serial/cpm_uart/cpm_uart.h
+++ b/drivers/tty/serial/cpm_uart/cpm_uart.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 *  Driver for CPM (SCC/SMC) serial ports
 *
@@ -5,11 +6,6 @@
 *
 *  2006 (c) MontaVista Software, Inc.
 *      Vitaly Bordug <vbordug@ru.mvista.com>
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- *
 */
 #ifndef CPM_UART_H
 #define CPM_UART_H
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
index 9ac142cfc1f1..24a5f05e769b 100644
--- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  Driver for CPM (SCC/SMC) serial ports; core driver
 *
@@ -12,21 +13,6 @@
 *            (C) 2004 Intracom, S.A.
 *            (C) 2005-2006 MontaVista Software, Inc.
 *              Vitaly Bordug <vbordug@ru.mvista.com>
- *
- * 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
- *
 */
 #include <linux/module.h>
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c
index 6d3b22e93246..4eba17f3d293 100644
--- a/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  Driver for CPM (SCC/SMC) serial ports; CPM1 definitions
 *
@@ -8,21 +9,6 @@
 *            (C) 2004 Intracom, S.A.
 *            (C) 2006 MontaVista Software, Inc.
 *              Vitaly Bordug <vbordug@ru.mvista.com>
- *
- * 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
- *
 */
 #include <linux/module.h>
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c
index f46d2ca87209..e3bff068dc3c 100644
--- a/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  Driver for CPM (SCC/SMC) serial ports; CPM2 definitions
 *
@@ -8,21 +9,6 @@
 *            (C) 2004 Intracom, S.A.
 *            (C) 2006 MontaVista Software, Inc.
 *              Vitaly Bordug <vbordug@ru.mvista.com>
- *
- * 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
- *
 */
 #include <linux/module.h>
diff --git a/drivers/tty/serial/digicolor-usart.c b/drivers/tty/serial/digicolor-usart.c
index 02ad6953b167..f460cca139e2 100644
--- a/drivers/tty/serial/digicolor-usart.c
+++ b/drivers/tty/serial/digicolor-usart.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  Driver for Conexant Digicolor serial ports (USART)
 *
 * Author: Baruch Siach <baruch@tkos.co.il>
 *
 * Copyright (C) 2014 Paradox Innovation Ltd.
- *
- * 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.
 */
 #include <linux/module.h>
diff --git a/drivers/tty/serial/dz.c b/drivers/tty/serial/dz.c
index ff465ff43577..7b57e840e255 100644
--- a/drivers/tty/serial/dz.c
+++ b/drivers/tty/serial/dz.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * dz.c: Serial port driver for DECstations equipped
 *       with the DZ chipset.
diff --git a/drivers/tty/serial/earlycon-arm-semihost.c b/drivers/tty/serial/earlycon-arm-semihost.c
index 6bbeb699777c..fa096c10b591 100644
--- a/drivers/tty/serial/earlycon-arm-semihost.c
+++ b/drivers/tty/serial/earlycon-arm-semihost.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Copyright (C) 2012 ARM Ltd.
 * Author: Marc Zyngier <marc.zyngier@arm.com>
@@ -5,18 +6,6 @@
 * Adapted for ARM and earlycon:
 * Copyright (C) 2014 Linaro Ltd.
 * Author: Rob Herring <robh@kernel.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * 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, see <http://www.gnu.org/licenses/>.
 */
 #include <linux/kernel.h>
 #include <linux/console.h>
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index 98928f082d87..4c8b80f1c688 100644
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Copyright (C) 2014 Linaro Ltd.
 * Author: Rob Herring <robh@kernel.org>
@@ -5,10 +6,6 @@
 * Based on 8250 earlycon:
 * (c) Copyright 2004 Hewlett-Packard Development Company, L.P.
 *      Bjorn Helgaas <bjorn.helgaas@hp.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
 */
 #define pr_fmt(fmt)     KBUILD_MODNAME ": " fmt
diff --git a/drivers/tty/serial/efm32-uart.c b/drivers/tty/serial/efm32-uart.c
index 9fff25be87f9..d6b5e5463746 100644
--- a/drivers/tty/serial/efm32-uart.c
+++ b/drivers/tty/serial/efm32-uart.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #if defined(CONFIG_SERIAL_EFM32_UART_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
 #define SUPPORT_SYSRQ
 #endif
diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index f0252184291e..c84e6f0db54e 100644
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  Freescale lpuart serial port driver
 *
 *  Copyright 2012-2014 Freescale Semiconductor, Inc.
- *
- * 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.
 */
 #if defined(CONFIG_SERIAL_FSL_LPUART_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
@@ -1632,12 +1628,11 @@ lpuart32_set_termios(struct uart_port *port, struct ktermios *termios,
 {
        struct lpuart_port *sport = container_of(port, struct lpuart_port, port);
        unsigned long flags;
-        unsigned long ctrl, old_ctrl, bd, modem;
+        unsigned long ctrl, old_ctrl, modem;
        unsigned int  baud;
        unsigned int old_csize = old ? old->c_cflag & CSIZE : CS8;
        ctrl = old_ctrl = lpuart32_read(&sport->port, UARTCTRL);
-        bd = lpuart32_read(&sport->port, UARTBAUD);
        modem = lpuart32_read(&sport->port, UARTMODIR);
        /*
         * only support CS8 and CS7, and for CS7 must enable PE.
@@ -2212,6 +2207,24 @@ static int lpuart_probe(struct platform_device *pdev)
        if (ret)
                goto failed_attach_port;
+        of_get_rs485_mode(np, &sport->port.rs485);
+        if (sport->port.rs485.flags & SER_RS485_RX_DURING_TX) {
+                dev_err(&pdev->dev, "driver doesn't support RX during TX\n");
+                return -ENOSYS;
+        }
+        if (sport->port.rs485.delay_rts_before_send ||
+            sport->port.rs485.delay_rts_after_send) {
+                dev_err(&pdev->dev, "driver doesn't support RTS delays\n");
+                return -ENOSYS;
+        }
+        if (sport->port.rs485.flags & SER_RS485_ENABLED) {
+                sport->port.rs485.flags |= SER_RS485_RTS_ON_SEND;
+                writeb(UARTMODEM_TXRTSE, sport->port.membase + UARTMODEM);
+        }
        sport->dma_tx_chan = dma_request_slave_channel(sport->port.dev, "tx");
        if (!sport->dma_tx_chan)
                dev_info(sport->port.dev, "DMA tx channel request failed, "
@@ -2222,12 +2235,6 @@ static int lpuart_probe(struct platform_device *pdev)
                dev_info(sport->port.dev, "DMA rx channel request failed, "
                                "operating without rx DMA\n");
-        if (of_property_read_bool(np, "linux,rs485-enabled-at-boot-time")) {
-                sport->port.rs485.flags |= SER_RS485_ENABLED;
-                sport->port.rs485.flags |= SER_RS485_RTS_ON_SEND;
-                writeb(UARTMODEM_TXRTSE, sport->port.membase + UARTMODEM);
-        }
        return 0;
 failed_attach_port:
diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c
index fe92d74f4ea5..ad374f7c476d 100644
--- a/drivers/tty/serial/icom.c
+++ b/drivers/tty/serial/icom.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * icom.c
  *
@@ -6,21 +7,6 @@
  * Serial device driver.
  *
  * Based on code from serial.c
-  *
-  * 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
-  *
  */
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/drivers/tty/serial/icom.h b/drivers/tty/serial/icom.h
index c8029e0025c9..8a77e739b333 100644
--- a/drivers/tty/serial/icom.h
+++ b/drivers/tty/serial/icom.h
@@ -1,23 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * icom.h
 *
 * Copyright (C) 2001 Michael Anderson, IBM Corporation
 *
 * Serial device driver include file.
- *
- * 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
 */
 #include <linux/serial_core.h>
diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
index f190a84a0246..473f4f81d690 100644
--- a/drivers/tty/serial/ifx6x60.c
+++ b/drivers/tty/serial/ifx6x60.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /****************************************************************************
 *
 * Driver for the IFX 6x60 spi modem.
@@ -10,20 +11,6 @@
 * Copyright (C) 2009, 2010 Intel Corp
 * Russ Gorby <russ.gorby@intel.com>
 *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
- * USA
- *
 * Driver modified by Intel from Option gtm501l_spi.c
 *
 * Notes
@@ -1029,9 +1016,8 @@ static int ifx_spi_spi_probe(struct spi_device *spi)
        spin_lock_init(&ifx_dev->write_lock);
        spin_lock_init(&ifx_dev->power_lock);
        ifx_dev->power_status = 0;
-        init_timer(&ifx_dev->spi_timer);
+        setup_timer(&ifx_dev->spi_timer, ifx_spi_timeout,
-        ifx_dev->spi_timer.function = ifx_spi_timeout;
+                    (unsigned long)ifx_dev);
-        ifx_dev->spi_timer.data = (unsigned long)ifx_dev;
        ifx_dev->modem = pl_data->modem_type;
        ifx_dev->use_dma = pl_data->use_dma;
        ifx_dev->max_hz = pl_data->max_hz;
diff --git a/drivers/tty/serial/ifx6x60.h b/drivers/tty/serial/ifx6x60.h
index 4fbddc297839..c5a2514212ff 100644
--- a/drivers/tty/serial/ifx6x60.h
+++ b/drivers/tty/serial/ifx6x60.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /****************************************************************************
 *
 * Driver for the IFX spi modem.
@@ -5,23 +6,6 @@
 * Copyright (C) 2009, 2010 Intel Corp
 * Jim Stanley <jim.stanley@intel.com>
 *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
- * USA
- *
- *
- *
 *****************************************************************************/
 #ifndef _IFX6X60_H
 #define _IFX6X60_H
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index dfeff3951f93..a67a606c38eb 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * Driver for Motorola/Freescale IMX serial ports
 *
@@ -5,16 +6,6 @@
 *
 * Author: Sascha Hauer <sascha@saschahauer.de>
 * Copyright (C) 2004 Pengutronix
- *
- * 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.
 */
 #if defined(CONFIG_SERIAL_IMX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
@@ -334,7 +325,8 @@ static void imx_port_rts_active(struct imx_port *sport, unsigned long *ucr2)
 {
        *ucr2 &= ~(UCR2_CTSC | UCR2_CTS);
-        mctrl_gpio_set(sport->gpios, sport->port.mctrl | TIOCM_RTS);
+        sport->port.mctrl |= TIOCM_RTS;
+        mctrl_gpio_set(sport->gpios, sport->port.mctrl);
 }
 static void imx_port_rts_inactive(struct imx_port *sport, unsigned long *ucr2)
@@ -342,7 +334,8 @@ static void imx_port_rts_inactive(struct imx_port *sport, unsigned long *ucr2)
        *ucr2 &= ~UCR2_CTSC;
        *ucr2 |= UCR2_CTS;
-        mctrl_gpio_set(sport->gpios, sport->port.mctrl & ~TIOCM_RTS);
+        sport->port.mctrl &= ~TIOCM_RTS;
+        mctrl_gpio_set(sport->gpios, sport->port.mctrl);
 }
 static void imx_port_rts_auto(struct imx_port *sport, unsigned long *ucr2)
@@ -714,8 +707,6 @@ static void imx_disable_rx_int(struct imx_port *sport)
 {
        unsigned long temp;
-        sport->dma_is_rxing = 1;
        /* disable the receiver ready and aging timer interrupts */
        temp = readl(sport->port.membase + UCR1);
        temp &= ~(UCR1_RRDYEN);
@@ -732,29 +723,6 @@ static void imx_disable_rx_int(struct imx_port *sport)
 }
 static void clear_rx_errors(struct imx_port *sport);
-static int start_rx_dma(struct imx_port *sport);
-/*
- * If the RXFIFO is filled with some data, and then we
- * arise a DMA operation to receive them.
- */
-static void imx_dma_rxint(struct imx_port *sport)
-{
-        unsigned long temp;
-        unsigned long flags;
-        spin_lock_irqsave(&sport->port.lock, flags);
-        temp = readl(sport->port.membase + USR2);
-        if ((temp & USR2_RDR) && !sport->dma_is_rxing) {
-                imx_disable_rx_int(sport);
-                /* tell the DMA to receive the data. */
-                start_rx_dma(sport);
-        }
-        spin_unlock_irqrestore(&sport->port.lock, flags);
-}
 /*
 * We have a modem side uart, so the meanings of RTS and CTS are inverted.
@@ -816,11 +784,8 @@ static irqreturn_t imx_int(int irq, void *dev_id)
        sts = readl(sport->port.membase + USR1);
        sts2 = readl(sport->port.membase + USR2);
-        if (sts & (USR1_RRDY | USR1_AGTIM)) {
+        if (!sport->dma_is_enabled && (sts & (USR1_RRDY | USR1_AGTIM))) {
-                if (sport->dma_is_enabled)
+                imx_rxint(irq, dev_id);
-                        imx_dma_rxint(sport);
-                else
-                        imx_rxint(irq, dev_id);
                ret = IRQ_HANDLED;
        }
@@ -1074,6 +1039,7 @@ static int start_rx_dma(struct imx_port *sport)
        desc->callback_param = sport;
        dev_dbg(dev, "RX: prepare for the DMA.\n");
+        sport->dma_is_rxing = 1;
        sport->rx_cookie = dmaengine_submit(desc);
        dma_async_issue_pending(chan);
        return 0;
@@ -1165,7 +1131,7 @@ static int imx_uart_dma_init(struct imx_port *sport)
                goto err;
        }
-        sport->rx_buf = kzalloc(PAGE_SIZE, GFP_KERNEL);
+        sport->rx_buf = kzalloc(RX_BUF_SIZE, GFP_KERNEL);
        if (!sport->rx_buf) {
                ret = -ENOMEM;
                goto err;
@@ -1207,10 +1173,6 @@ static void imx_enable_dma(struct imx_port *sport)
        temp |= UCR1_RDMAEN | UCR1_TDMAEN | UCR1_ATDMAEN;
        writel(temp, sport->port.membase + UCR1);
-        temp = readl(sport->port.membase + UCR2);
-        temp |= UCR2_ATEN;
-        writel(temp, sport->port.membase + UCR2);
        imx_setup_ufcr(sport, TXTL_DMA, RXTL_DMA);
        sport->dma_is_enabled = 1;
@@ -1411,15 +1373,19 @@ static void imx_flush_buffer(struct uart_port *port)
                temp = readl(sport->port.membase + UCR1);
                temp &= ~UCR1_TDMAEN;
                writel(temp, sport->port.membase + UCR1);
-                sport->dma_is_txing = false;
+                sport->dma_is_txing = 0;
        }
        /*
         * According to the Reference Manual description of the UART SRST bit:
+         *
         * "Reset the transmit and receive state machines,
         * all FIFOs and register USR1, USR2, UBIR, UBMR, UBRC, URXD, UTXD
-         * and UTS[6-3]". As we don't need to restore the old values from
+         * and UTS[6-3]".
-         * USR1, USR2, URXD, UTXD, only save/restore the other four registers
+         *
+         * We don't need to restore the old values from USR1, USR2, URXD and
+         * UTXD. UBRC is read only, so only save/restore the other three
+         * registers.
         */
        ubir = readl(sport->port.membase + UBIR);
        ubmr = readl(sport->port.membase + UBMR);
@@ -2051,6 +2017,8 @@ static int serial_imx_probe_dt(struct imx_port *sport,
        if (of_get_property(np, "rts-gpios", NULL))
                sport->have_rtsgpio = 1;
+        of_get_rs485_mode(np, &sport->port.rs485);
        return 0;
 }
 #else
@@ -2112,12 +2080,9 @@ static int serial_imx_probe(struct platform_device *pdev)
        sport->port.fifosize = 32;
        sport->port.ops = &imx_pops;
        sport->port.rs485_config = imx_rs485_config;
-        sport->port.rs485.flags =
+        sport->port.rs485.flags |= SER_RS485_RTS_ON_SEND;
-                SER_RS485_RTS_ON_SEND | SER_RS485_RX_DURING_TX;
        sport->port.flags = UPF_BOOT_AUTOCONF;
-        init_timer(&sport->timer);
+        setup_timer(&sport->timer, imx_timeout, (unsigned long)sport);
-        sport->timer.function = imx_timeout;
-        sport->timer.data     = (unsigned long)sport;
        sport->gpios = mctrl_gpio_init(&sport->port, 0);
        if (IS_ERR(sport->gpios))
@@ -2346,11 +2311,39 @@ static int imx_serial_port_resume(struct device *dev)
        return 0;
 }
+static int imx_serial_port_freeze(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct imx_port *sport = platform_get_drvdata(pdev);
+        uart_suspend_port(&imx_reg, &sport->port);
+        /* Needed to enable clock in suspend_noirq */
+        return clk_prepare(sport->clk_ipg);
+}
+static int imx_serial_port_thaw(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct imx_port *sport = platform_get_drvdata(pdev);
+        uart_resume_port(&imx_reg, &sport->port);
+        clk_unprepare(sport->clk_ipg);
+        return 0;
+}
 static const struct dev_pm_ops imx_serial_port_pm_ops = {
        .suspend_noirq = imx_serial_port_suspend_noirq,
        .resume_noirq = imx_serial_port_resume_noirq,
+        .freeze_noirq = imx_serial_port_suspend_noirq,
+        .restore_noirq = imx_serial_port_resume_noirq,
        .suspend = imx_serial_port_suspend,
        .resume = imx_serial_port_resume,
+        .freeze = imx_serial_port_freeze,
+        .thaw = imx_serial_port_thaw,
+        .restore = imx_serial_port_thaw,
 };
 static struct platform_driver serial_imx_driver = {
diff --git a/drivers/tty/serial/ioc3_serial.c b/drivers/tty/serial/ioc3_serial.c
index 906ee770ff4a..d8a1cdd6a53d 100644
--- a/drivers/tty/serial/ioc3_serial.c
+++ b/drivers/tty/serial/ioc3_serial.c
@@ -1,8 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
 * Copyright (C) 2005 Silicon Graphics, Inc.  All Rights Reserved.
 */
diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
index 43d7d32eb150..db5b979e5a0c 100644
--- a/drivers/tty/serial/ioc4_serial.c
+++ b/drivers/tty/serial/ioc4_serial.c
@@ -1,8 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
 * Copyright (C) 2003-2006 Silicon Graphics, Inc.  All Rights Reserved.
 */
diff --git a/drivers/tty/serial/ip22zilog.c b/drivers/tty/serial/ip22zilog.c
index 7ddddb4c3844..8c810733df3d 100644
--- a/drivers/tty/serial/ip22zilog.c
+++ b/drivers/tty/serial/ip22zilog.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Driver for Zilog serial chips found on SGI workstations and
 * servers.  This driver could actually be made more generic.
diff --git a/drivers/tty/serial/jsm/jsm.h b/drivers/tty/serial/jsm/jsm.h
index 0b79b87df47d..7a128aaa3a66 100644
--- a/drivers/tty/serial/jsm/jsm.h
+++ b/drivers/tty/serial/jsm/jsm.h
@@ -1,18 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /************************************************************************
 * Copyright 2003 Digi International (www.digi.com)
 *
 * Copyright (C) 2004 IBM Corporation. All rights reserved.
 *
- * 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, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
 * Contact Information:
 * Scott H Kilau <Scott_Kilau@digi.com>
 * Wendy Xiong   <wendyx@us.ibm.com>
diff --git a/drivers/tty/serial/jsm/jsm_cls.c b/drivers/tty/serial/jsm/jsm_cls.c
index 4eb12a9cae76..c061a7b7bd23 100644
--- a/drivers/tty/serial/jsm/jsm_cls.c
+++ b/drivers/tty/serial/jsm/jsm_cls.c
@@ -1,17 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * Copyright 2003 Digi International (www.digi.com)
 *      Scott H Kilau <Scott_Kilau at digi dot com>
 *
- * 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, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
 *      NOTE TO LINUX KERNEL HACKERS:  DO NOT REFORMAT THIS CODE!
 *
 *      This is shared code between Digi's CVS archive and the
diff --git a/drivers/tty/serial/jsm/jsm_driver.c b/drivers/tty/serial/jsm/jsm_driver.c
index 102d499814ac..592e51d8944e 100644
--- a/drivers/tty/serial/jsm/jsm_driver.c
+++ b/drivers/tty/serial/jsm/jsm_driver.c
@@ -1,18 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /************************************************************************
 * Copyright 2003 Digi International (www.digi.com)
 *
 * Copyright (C) 2004 IBM Corporation. All rights reserved.
 *
- * 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, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
 * Contact Information:
 * Scott H Kilau <Scott_Kilau@digi.com>
 * Wendy Xiong   <wendyx@us.ibm.com>
diff --git a/drivers/tty/serial/jsm/jsm_neo.c b/drivers/tty/serial/jsm/jsm_neo.c
index c6fdd6369534..4718560b8fdc 100644
--- a/drivers/tty/serial/jsm/jsm_neo.c
+++ b/drivers/tty/serial/jsm/jsm_neo.c
@@ -1,18 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /************************************************************************
 * Copyright 2003 Digi International (www.digi.com)
 *
 * Copyright (C) 2004 IBM Corporation. All rights reserved.
 *
- * 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, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
 * Contact Information:
 * Scott H Kilau <Scott_Kilau@digi.com>
 * Wendy Xiong   <wendyx@us.ibm.com>
diff --git a/drivers/tty/serial/jsm/jsm_tty.c b/drivers/tty/serial/jsm/jsm_tty.c
index ec7d8383900f..469927d37b41 100644
--- a/drivers/tty/serial/jsm/jsm_tty.c
+++ b/drivers/tty/serial/jsm/jsm_tty.c
@@ -1,18 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /************************************************************************
 * Copyright 2003 Digi International (www.digi.com)
 *
 * Copyright (C) 2004 IBM Corporation. All rights reserved.
 *
- * 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, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
 * Contact Information:
 * Scott H Kilau <Scott_Kilau@digi.com>
 * Ananda Venkatarman <mansarov@us.ibm.com>
@@ -36,7 +27,7 @@ static void jsm_carrier(struct jsm_channel *ch);
 static inline int jsm_get_mstat(struct jsm_channel *ch)
 {
        unsigned char mstat;
-        unsigned result;
+        int result;
        jsm_dbg(IOCTL, &ch->ch_bd->pci_dev, "start\n");
@@ -124,6 +115,7 @@ static void jsm_tty_set_mctrl(struct uart_port *port, unsigned int mctrl)
 static void jsm_tty_write(struct uart_port *port)
 {
        struct jsm_channel *channel;
        channel = container_of(port, struct jsm_channel, uart_port);
        channel->ch_bd->bd_ops->copy_data_from_queue_to_uart(channel);
 }
@@ -275,14 +267,12 @@ static int jsm_tty_open(struct uart_port *port)
 static void jsm_tty_close(struct uart_port *port)
 {
        struct jsm_board *bd;
-        struct ktermios *ts;
        struct jsm_channel *channel =
                container_of(port, struct jsm_channel, uart_port);
        jsm_dbg(CLOSE, &channel->ch_bd->pci_dev, "start\n");
        bd = channel->ch_bd;
-        ts = &port->state->port.tty->termios;
        channel->ch_flags &= ~(CH_STOPI);
@@ -473,12 +463,11 @@ int jsm_uart_port_init(struct jsm_board *brd)
                } else
                        set_bit(line, linemap);
                brd->channels[i]->uart_port.line = line;
-                rc = uart_add_one_port (&jsm_uart_driver, &brd->channels[i]->uart_port);
+                rc = uart_add_one_port(&jsm_uart_driver, &brd->channels[i]->uart_port);
-                if (rc){
+                if (rc) {
                        printk(KERN_INFO "jsm: Port %d failed. Aborting...\n", i);
                        return rc;
-                }
+                } else
-                else
                        printk(KERN_INFO "jsm: Port %d added\n", i);
        }
@@ -541,7 +530,7 @@ void jsm_input(struct jsm_channel *ch)
        tp = port->tty;
        bd = ch->ch_bd;
-        if(!bd)
+        if (!bd)
                return;
        spin_lock_irqsave(&ch->ch_lock, lock_flags);
@@ -781,7 +770,7 @@ void jsm_check_queue_flow_control(struct jsm_channel *ch)
        if (qleft < 256) {
                /* HWFLOW */
                if (ch->ch_c_cflag & CRTSCTS) {
-                        if(!(ch->ch_flags & CH_RECEIVER_OFF)) {
+                        if (!(ch->ch_flags & CH_RECEIVER_OFF)) {
                                bd_ops->disable_receiver(ch);
                                ch->ch_flags |= (CH_RECEIVER_OFF);
                                jsm_dbg(READ, &ch->ch_bd->pci_dev,
diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
index 117df151627d..ed2b03058627 100644
--- a/drivers/tty/serial/kgdb_nmi.c
+++ b/drivers/tty/serial/kgdb_nmi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * KGDB NMI serial console
 *
@@ -6,10 +7,6 @@
 *                Colin Cross <ccross@android.com>
 * Copyright 2012 Linaro Ltd.
 *                Anton Vorontsov <anton.vorontsov@linaro.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
 */
 #include <linux/kernel.h>
diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
index a260cde743e2..ddb46fa2d07f 100644
--- a/drivers/tty/serial/kgdboc.c
+++ b/drivers/tty/serial/kgdboc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Based on the same principle as kgdboe using the NETPOLL api, this
 * driver uses a console polling api to implement a gdb serial inteface
@@ -6,10 +7,6 @@
 * Maintainer: Jason Wessel <jason.wessel@windriver.com>
 *
 * 2007-2008 (c) Jason Wessel - Wind River Systems, Inc.
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
 */
 #include <linux/kernel.h>
 #include <linux/ctype.h>
diff --git a/drivers/tty/serial/lantiq.c b/drivers/tty/serial/lantiq.c
index 22df94f107e5..044128277248 100644
--- a/drivers/tty/serial/lantiq.c
+++ b/drivers/tty/serial/lantiq.c
@@ -1,19 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
 *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- *
- * 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
- *
 * Copyright (C) 2004 Infineon IFAP DC COM CPE
 * Copyright (C) 2007 Felix Fietkau <nbd@openwrt.org>
 * Copyright (C) 2007 John Crispin <john@phrozen.org>
diff --git a/drivers/tty/serial/lpc32xx_hs.c b/drivers/tty/serial/lpc32xx_hs.c
index cea57ff32c33..d1d73261575b 100644
--- a/drivers/tty/serial/lpc32xx_hs.c
+++ b/drivers/tty/serial/lpc32xx_hs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * High Speed Serial Ports on NXP LPC32xx SoC
 *
@@ -6,16 +7,6 @@
 *
 * Copyright (C) 2010 NXP Semiconductors
 * Copyright (C) 2012 Roland Stigge
- *
- * 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.
 */
 #include <linux/module.h>
diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/m32r_sio.c
index 5b3bd9511993..7b83a8aab495 100644
--- a/drivers/tty/serial/m32r_sio.c
+++ b/drivers/tty/serial/m32r_sio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  m32r_sio.c
 *
@@ -8,11 +9,6 @@
 *
 *  Copyright (C) 2001  Russell King.
 *  Copyright (C) 2004  Hirokazu Takata <takata at linux-m32r.org>
- *
- * 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.
 */
 /*
@@ -511,9 +507,9 @@ static void serial_unlink_irq_chain(struct uart_sio_port *up)
 /*
 * This function is used to handle ports that do not have an interrupt.
 */
-static void m32r_sio_timeout(unsigned long data)
+static void m32r_sio_timeout(struct timer_list *t)
 {
-        struct uart_sio_port *up = (struct uart_sio_port *)data;
+        struct uart_sio_port *up = from_timer(up, t, timer);
        unsigned int timeout;
        unsigned int sts;
@@ -576,7 +572,6 @@ static int m32r_sio_startup(struct uart_port *port)
                timeout = timeout > 6 ? (timeout / 2 - 2) : 1;
-                up->timer.data = (unsigned long)up;
                mod_timer(&up->timer, jiffies + timeout);
        } else {
                retval = serial_link_irq_chain(up);
@@ -907,8 +902,7 @@ static void __init m32r_sio_register_ports(struct uart_driver *drv)
                up->port.line = i;
                up->port.ops = &m32r_sio_pops;
-                init_timer(&up->timer);
+                timer_setup(&up->timer, m32r_sio_timeout, 0);
-                up->timer.function = m32r_sio_timeout;
                uart_add_one_port(drv, &up->port);
        }
diff --git a/drivers/tty/serial/m32r_sio_reg.h b/drivers/tty/serial/m32r_sio_reg.h
index 4671473793e3..6eed48828f94 100644
--- a/drivers/tty/serial/m32r_sio_reg.h
+++ b/drivers/tty/serial/m32r_sio_reg.h
@@ -1,12 +1,10 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
 * m32r_sio_reg.h
 *
 * Copyright (C) 1992, 1994 by Theodore Ts'o.
 * Copyright (C) 2004  Hirokazu Takata <takata at linux-m32r.org>
 *
- * Redistribution of this file is permitted under the terms of the GNU
- * Public License (GPL)
- *
 * These are the UART port assignments, expressed as offsets from the base
 * register.  These assignments should hold for any serial port based on
 * a 8250, 16450, or 16550(A).
diff --git a/drivers/tty/serial/max3100.c b/drivers/tty/serial/max3100.c
index ace82645b123..27d6049eb6a9 100644
--- a/drivers/tty/serial/max3100.c
+++ b/drivers/tty/serial/max3100.c
@@ -1,13 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *
 *  Copyright (C) 2008 Christian Pellegrin <chripell@evolware.org>
 *
- * 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.
- *
- *
 * Notes: the MAX3100 doesn't provide an interrupt on CTS so we have
 * to use polling for flow control. TX empty IRQ is unusable, since
 * writing conf clears FIFO buffer and we cannot have this interrupt
@@ -263,7 +258,7 @@ static void max3100_work(struct work_struct *w)
        struct max3100_port *s = container_of(w, struct max3100_port, work);
        int rxchars;
        u16 tx, rx;
-        int conf, cconf, rts, crts;
+        int conf, cconf, crts;
        struct circ_buf *xmit = &s->port.state->xmit;
        dev_dbg(&s->spi->dev, "%s\n", __func__);
@@ -274,7 +269,6 @@ static void max3100_work(struct work_struct *w)
                conf = s->conf;
                cconf = s->conf_commit;
                s->conf_commit = 0;
-                rts = s->rts;
                crts = s->rts_commit;
                s->rts_commit = 0;
                spin_unlock(&s->conf_lock);
@@ -436,7 +430,6 @@ max3100_set_termios(struct uart_port *port, struct ktermios *termios,
        dev_dbg(&s->spi->dev, "%s\n", __func__);
        cflag = termios->c_cflag;
-        param_new = 0;
        param_mask = 0;
        baud = tty_termios_baud_rate(termios);
@@ -787,9 +780,8 @@ static int max3100_probe(struct spi_device *spi)
                max3100s[i]->poll_time = 1;
        max3100s[i]->max3100_hw_suspend = pdata->max3100_hw_suspend;
        max3100s[i]->minor = i;
-        init_timer(&max3100s[i]->timer);
+        setup_timer(&max3100s[i]->timer, max3100_timeout,
-        max3100s[i]->timer.function = max3100_timeout;
+                    (unsigned long)max3100s[i]);
-        max3100s[i]->timer.data = (unsigned long) max3100s[i];
        dev_dbg(&spi->dev, "%s: adding port %d\n", __func__, i);
        max3100s[i]->port.irq = max3100s[i]->irq;
diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c
index 9dfedbe6c071..ecb6513a6505 100644
--- a/drivers/tty/serial/max310x.c
+++ b/drivers/tty/serial/max310x.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  Maxim (Dallas) MAX3107/8/9, MAX14830 serial driver
 *
@@ -6,11 +7,6 @@
 *  Based on max3100.c, by Christian Pellegrin <chripell@evolware.org>
 *  Based on max3110.c, by Feng Tang <feng.tang@intel.com>
 *  Based on max3107.c, by Aavamobile
- *
- *  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.
 */
 #include <linux/bitops.h>
diff --git a/drivers/tty/serial/mcf.c b/drivers/tty/serial/mcf.c
index 02eb32217685..7dbfb4cde124 100644
--- a/drivers/tty/serial/mcf.c
+++ b/drivers/tty/serial/mcf.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /****************************************************************************/
 /*
 *      mcf.c -- Freescale ColdFire UART driver
 *
 *      (C) Copyright 2003-2007, Greg Ungerer <gerg@uclinux.org>
- *
- * 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.
 */
 /****************************************************************************/
diff --git a/drivers/tty/serial/men_z135_uart.c b/drivers/tty/serial/men_z135_uart.c
index e72ea61c70db..ef89534dd760 100644
--- a/drivers/tty/serial/men_z135_uart.c
+++ b/drivers/tty/serial/men_z135_uart.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * MEN 16z135 High Speed UART
 *
 * Copyright (C) 2014 MEN Mikroelektronik GmbH (www.men.de)
 * Author: Johannes Thumshirn <johannes.thumshirn@men.de>
- *
- * 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; version 2 of the License.
 */
 #define pr_fmt(fmt) KBUILD_MODNAME ":" fmt
diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c
index 07c0f98be3ac..daafe60175da 100644
--- a/drivers/tty/serial/meson_uart.c
+++ b/drivers/tty/serial/meson_uart.c
@@ -1,19 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 *  Based on meson_uart.c, by AMLOGIC, INC.
 *
 * Copyright (C) 2014 Carlo Caione <carlo@caione.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- *
- * 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.
- *
 */
+#if defined(CONFIG_SERIAL_MESON_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
 #include <linux/clk.h>
 #include <linux/console.h>
 #include <linux/delay.h>
@@ -183,12 +178,12 @@ static void meson_receive_chars(struct uart_port *port)
 {
        struct tty_port *tport = &port->state->port;
        char flag;
-        u32 status, ch, mode;
+        u32 ostatus, status, ch, mode;
        do {
                flag = TTY_NORMAL;
                port->icount.rx++;
-                status = readl(port->membase + AML_UART_STATUS);
+                ostatus = status = readl(port->membase + AML_UART_STATUS);
                if (status & AML_UART_ERR) {
                        if (status & AML_UART_TX_FIFO_WERR)
@@ -216,6 +211,16 @@ static void meson_receive_chars(struct uart_port *port)
                ch = readl(port->membase + AML_UART_RFIFO);
                ch &= 0xff;
+                if ((ostatus & AML_UART_FRAME_ERR) && (ch == 0)) {
+                        port->icount.brk++;
+                        flag = TTY_BREAK;
+                        if (uart_handle_break(port))
+                                continue;
+                }
+                if (uart_handle_sysrq_char(port, ch))
+                        continue;
                if ((status & port->ignore_status_mask) == 0)
                        tty_insert_flip_char(tport, ch, flag);
@@ -362,7 +367,7 @@ static void meson_uart_set_termios(struct uart_port *port,
        writel(val, port->membase + AML_UART_CONTROL);
-        baud = uart_get_baud_rate(port, termios, old, 9600, 4000000);
+        baud = uart_get_baud_rate(port, termios, old, 50, 4000000);
        meson_uart_change_speed(port, baud);
        port->read_status_mask = AML_UART_TX_FIFO_WERR;
diff --git a/drivers/tty/serial/mpc52xx_uart.c b/drivers/tty/serial/mpc52xx_uart.c
index 791c4c74f6d6..3a75ee08d619 100644
--- a/drivers/tty/serial/mpc52xx_uart.c
+++ b/drivers/tty/serial/mpc52xx_uart.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Driver for the PSC of the Freescale MPC52xx PSCs configured as UARTs.
 *
@@ -23,10 +24,6 @@
 *                    Grant Likely <grant.likely@secretlab.ca>
 * Copyright (C) 2004-2006 Sylvain Munaut <tnt@246tNt.com>
 * Copyright (C) 2003 MontaVista, Software, Inc.
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
 */
 #undef DEBUG
diff --git a/drivers/tty/serial/mps2-uart.c b/drivers/tty/serial/mps2-uart.c
index 492ec4b375a0..9f8f63719126 100644
--- a/drivers/tty/serial/mps2-uart.c
+++ b/drivers/tty/serial/mps2-uart.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * MPS2 UART driver
 *
@@ -5,10 +6,6 @@
 *
 * Author: Vladimir Murzin <vladimir.murzin@arm.com>
 *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
 * TODO: support for SysRq
 */
diff --git a/drivers/tty/serial/mpsc.c b/drivers/tty/serial/mpsc.c
index 67ffecc50e42..1f60d6fe4ff2 100644
--- a/drivers/tty/serial/mpsc.c
+++ b/drivers/tty/serial/mpsc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Generic driver for the MPSC (UART mode) on Marvell parts (e.g., GT64240,
 * GT64260, MV64340, MV64360, GT96100, ... ).
@@ -10,10 +11,7 @@
 * taken from PPCBoot (now U-Boot).  Also based on drivers/serial/8250.c
 * by Russell King.
 *
- * 2004 (c) MontaVista, Software, Inc.  This file is licensed under
+ * 2004 (c) MontaVista, Software, Inc.
- * the terms of the GNU General Public License version 2.  This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
 */
 /*
 * The MPSC interface is much like a typical network controller's interface.
diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index 1db79ee8a886..ee96cf0d0057 100644
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -1,18 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Driver for msm7k serial device and console
 *
 * Copyright (C) 2007 Google, Inc.
 * Author: Robert Love <rlove@google.com>
 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
 */
 #if defined(CONFIG_SERIAL_MSM_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
diff --git a/drivers/tty/serial/mux.c b/drivers/tty/serial/mux.c
index 2bff69e70e4b..3b74369c262f 100644
--- a/drivers/tty/serial/mux.c
+++ b/drivers/tty/serial/mux.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 ** mux.c:
 **      serial driver for the Mux console found in some PA-RISC servers.
@@ -5,11 +6,6 @@
 **      (c) Copyright 2002 Ryan Bradetich
 **      (c) Copyright 2002 Hewlett-Packard Company
 **
-** 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 Driver currently only supports the console (port 0) on the MUX.
 ** Additional work will be needed on this driver to enable the full
 ** functionality of the MUX.
@@ -576,8 +572,7 @@ static int __init mux_init(void)
        if(port_cnt > 0) {
                /* Start the Mux timer */
-                init_timer(&mux_timer);
+                setup_timer(&mux_timer, mux_poll, 0UL);
-                mux_timer.function = mux_poll;
                mod_timer(&mux_timer, jiffies + MUX_POLL_DELAY);
 #ifdef CONFIG_SERIAL_MUX_CONSOLE
diff --git a/drivers/tty/serial/mvebu-uart.c b/drivers/tty/serial/mvebu-uart.c
index 45b57c294d13..a100e98259d7 100644
--- a/drivers/tty/serial/mvebu-uart.c
+++ b/drivers/tty/serial/mvebu-uart.c
@@ -1,21 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * ***************************************************************************
 * Marvell Armada-3700 Serial Driver
 * Author: Wilson Ding <dingwei@marvell.com>
 * Copyright (C) 2015 Marvell International Ltd.
 * ***************************************************************************
-* 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 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, see <http://www.gnu.org/licenses/>.
-* ***************************************************************************
 */
 #include <linux/clk.h>
@@ -38,46 +27,40 @@
 #include <linux/tty_flip.h>
 /* Register Map */
-#define UART_RBR                0x00
+#define UART_STD_RBR            0x00
-#define  RBR_BRK_DET            BIT(15)
+#define UART_EXT_RBR            0x18
-#define  RBR_FRM_ERR_DET        BIT(14)
-#define  RBR_PAR_ERR_DET        BIT(13)
-#define  RBR_OVR_ERR_DET        BIT(12)
-#define UART_TSH                0x04
+#define UART_STD_TSH            0x04
+#define UART_EXT_TSH            0x1C
-#define UART_CTRL               0x08
+#define UART_STD_CTRL1          0x08
+#define UART_EXT_CTRL1          0x04
 #define  CTRL_SOFT_RST          BIT(31)
 #define  CTRL_TXFIFO_RST        BIT(15)
 #define  CTRL_RXFIFO_RST        BIT(14)
-#define  CTRL_ST_MIRR_EN        BIT(13)
-#define  CTRL_LPBK_EN           BIT(12)
 #define  CTRL_SND_BRK_SEQ       BIT(11)
-#define  CTRL_PAR_EN            BIT(10)
-#define  CTRL_TWO_STOP          BIT(9)
-#define  CTRL_TX_HFL_INT        BIT(8)
-#define  CTRL_RX_HFL_INT        BIT(7)
-#define  CTRL_TX_EMP_INT        BIT(6)
-#define  CTRL_TX_RDY_INT        BIT(5)
-#define  CTRL_RX_RDY_INT        BIT(4)
 #define  CTRL_BRK_DET_INT       BIT(3)
 #define  CTRL_FRM_ERR_INT       BIT(2)
 #define  CTRL_PAR_ERR_INT       BIT(1)
 #define  CTRL_OVR_ERR_INT       BIT(0)
-#define  CTRL_RX_INT                    (CTRL_RX_RDY_INT | CTRL_BRK_DET_INT |\
+#define  CTRL_BRK_INT           (CTRL_BRK_DET_INT | CTRL_FRM_ERR_INT | \
-        CTRL_FRM_ERR_INT | CTRL_PAR_ERR_INT | CTRL_OVR_ERR_INT)
+                                CTRL_PAR_ERR_INT | CTRL_OVR_ERR_INT)
+#define UART_STD_CTRL2          UART_STD_CTRL1
+#define UART_EXT_CTRL2          0x20
+#define  CTRL_STD_TX_RDY_INT    BIT(5)
+#define  CTRL_EXT_TX_RDY_INT    BIT(6)
+#define  CTRL_STD_RX_RDY_INT    BIT(4)
+#define  CTRL_EXT_RX_RDY_INT    BIT(5)
-#define UART_STAT               0x0c
+#define UART_STAT               0x0C
 #define  STAT_TX_FIFO_EMP       BIT(13)
-#define  STAT_RX_FIFO_EMP       BIT(12)
 #define  STAT_TX_FIFO_FUL       BIT(11)
-#define  STAT_TX_FIFO_HFL       BIT(10)
-#define  STAT_RX_TOGL           BIT(9)
-#define  STAT_RX_FIFO_FUL       BIT(8)
-#define  STAT_RX_FIFO_HFL       BIT(7)
 #define  STAT_TX_EMP            BIT(6)
-#define  STAT_TX_RDY            BIT(5)
+#define  STAT_STD_TX_RDY        BIT(5)
-#define  STAT_RX_RDY            BIT(4)
+#define  STAT_EXT_TX_RDY        BIT(15)
+#define  STAT_STD_RX_RDY        BIT(4)
+#define  STAT_EXT_RX_RDY        BIT(14)
 #define  STAT_BRK_DET           BIT(3)
 #define  STAT_FRM_ERR           BIT(2)
 #define  STAT_PAR_ERR           BIT(1)
@@ -86,18 +69,73 @@
                                 | STAT_PAR_ERR | STAT_OVR_ERR)
 #define UART_BRDV               0x10
+#define  BRDV_BAUD_MASK         0x3FF
-#define MVEBU_NR_UARTS          1
+#define MVEBU_NR_UARTS          2
 #define MVEBU_UART_TYPE         "mvebu-uart"
+#define DRIVER_NAME             "mvebu_serial"
+enum {
+        /* Either there is only one summed IRQ... */
+        UART_IRQ_SUM = 0,
+        /* ...or there are two separate IRQ for RX and TX */
+        UART_RX_IRQ = 0,
+        UART_TX_IRQ,
+        UART_IRQ_COUNT
+};
-static struct uart_port mvebu_uart_ports[MVEBU_NR_UARTS];
+/* Diverging register offsets */
+struct uart_regs_layout {
+        unsigned int rbr;
+        unsigned int tsh;
+        unsigned int ctrl;
+        unsigned int intr;
+};
+/* Diverging flags */
+struct uart_flags {
+        unsigned int ctrl_tx_rdy_int;
+        unsigned int ctrl_rx_rdy_int;
+        unsigned int stat_tx_rdy;
+        unsigned int stat_rx_rdy;
+};
+/* Driver data, a structure for each UART port */
+struct mvebu_uart_driver_data {
+        bool is_ext;
+        struct uart_regs_layout regs;
+        struct uart_flags flags;
+};
-struct mvebu_uart_data {
+/* MVEBU UART driver structure */
+struct mvebu_uart {
        struct uart_port *port;
-        struct clk       *clk;
+        struct clk *clk;
+        int irq[UART_IRQ_COUNT];
+        unsigned char __iomem *nb;
+        struct mvebu_uart_driver_data *data;
 };
+static struct mvebu_uart *to_mvuart(struct uart_port *port)
+{
+        return (struct mvebu_uart *)port->private_data;
+}
+#define IS_EXTENDED(port) (to_mvuart(port)->data->is_ext)
+#define UART_RBR(port) (to_mvuart(port)->data->regs.rbr)
+#define UART_TSH(port) (to_mvuart(port)->data->regs.tsh)
+#define UART_CTRL(port) (to_mvuart(port)->data->regs.ctrl)
+#define UART_INTR(port) (to_mvuart(port)->data->regs.intr)
+#define CTRL_TX_RDY_INT(port) (to_mvuart(port)->data->flags.ctrl_tx_rdy_int)
+#define CTRL_RX_RDY_INT(port) (to_mvuart(port)->data->flags.ctrl_rx_rdy_int)
+#define STAT_TX_RDY(port) (to_mvuart(port)->data->flags.stat_tx_rdy)
+#define STAT_RX_RDY(port) (to_mvuart(port)->data->flags.stat_rx_rdy)
+static struct uart_port mvebu_uart_ports[MVEBU_NR_UARTS];
 /* Core UART Driver Operations */
 static unsigned int mvebu_uart_tx_empty(struct uart_port *port)
 {
@@ -127,26 +165,39 @@ static void mvebu_uart_set_mctrl(struct uart_port *port,
 static void mvebu_uart_stop_tx(struct uart_port *port)
 {
-        unsigned int ctl = readl(port->membase + UART_CTRL);
+        unsigned int ctl = readl(port->membase + UART_INTR(port));
-        ctl &= ~CTRL_TX_RDY_INT;
+        ctl &= ~CTRL_TX_RDY_INT(port);
-        writel(ctl, port->membase + UART_CTRL);
+        writel(ctl, port->membase + UART_INTR(port));
 }
 static void mvebu_uart_start_tx(struct uart_port *port)
 {
-        unsigned int ctl = readl(port->membase + UART_CTRL);
+        unsigned int ctl;
+        struct circ_buf *xmit = &port->state->xmit;
+        if (IS_EXTENDED(port) && !uart_circ_empty(xmit)) {
+                writel(xmit->buf[xmit->tail], port->membase + UART_TSH(port));
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                port->icount.tx++;
+        }
-        ctl |= CTRL_TX_RDY_INT;
+        ctl = readl(port->membase + UART_INTR(port));
-        writel(ctl, port->membase + UART_CTRL);
+        ctl |= CTRL_TX_RDY_INT(port);
+        writel(ctl, port->membase + UART_INTR(port));
 }
 static void mvebu_uart_stop_rx(struct uart_port *port)
 {
-        unsigned int ctl = readl(port->membase + UART_CTRL);
+        unsigned int ctl;
+        ctl = readl(port->membase + UART_CTRL(port));
+        ctl &= ~CTRL_BRK_INT;
+        writel(ctl, port->membase + UART_CTRL(port));
-        ctl &= ~CTRL_RX_INT;
+        ctl = readl(port->membase + UART_INTR(port));
-        writel(ctl, port->membase + UART_CTRL);
+        ctl &= ~CTRL_RX_RDY_INT(port);
+        writel(ctl, port->membase + UART_INTR(port));
 }
 static void mvebu_uart_break_ctl(struct uart_port *port, int brk)
@@ -155,12 +206,12 @@ static void mvebu_uart_break_ctl(struct uart_port *port, int brk)
        unsigned long flags;
        spin_lock_irqsave(&port->lock, flags);
-        ctl = readl(port->membase + UART_CTRL);
+        ctl = readl(port->membase + UART_CTRL(port));
        if (brk == -1)
                ctl |= CTRL_SND_BRK_SEQ;
        else
                ctl &= ~CTRL_SND_BRK_SEQ;
-        writel(ctl, port->membase + UART_CTRL);
+        writel(ctl, port->membase + UART_CTRL(port));
        spin_unlock_irqrestore(&port->lock, flags);
 }
@@ -171,8 +222,8 @@ static void mvebu_uart_rx_chars(struct uart_port *port, unsigned int status)
        char flag = 0;
        do {
-                if (status & STAT_RX_RDY) {
+                if (status & STAT_RX_RDY(port)) {
-                        ch = readl(port->membase + UART_RBR);
+                        ch = readl(port->membase + UART_RBR(port));
                        ch &= 0xff;
                        flag = TTY_NORMAL;
                        port->icount.rx++;
@@ -198,7 +249,7 @@ static void mvebu_uart_rx_chars(struct uart_port *port, unsigned int status)
                        goto ignore_char;
                if (status & port->ignore_status_mask & STAT_PAR_ERR)
-                        status &= ~STAT_RX_RDY;
+                        status &= ~STAT_RX_RDY(port);
                status &= port->read_status_mask;
@@ -207,7 +258,7 @@ static void mvebu_uart_rx_chars(struct uart_port *port, unsigned int status)
                status &= ~port->ignore_status_mask;
-                if (status & STAT_RX_RDY)
+                if (status & STAT_RX_RDY(port))
                        tty_insert_flip_char(tport, ch, flag);
                if (status & STAT_BRK_DET)
@@ -221,7 +272,7 @@ static void mvebu_uart_rx_chars(struct uart_port *port, unsigned int status)
 ignore_char:
                status = readl(port->membase + UART_STAT);
-        } while (status & (STAT_RX_RDY | STAT_BRK_DET));
+        } while (status & (STAT_RX_RDY(port) | STAT_BRK_DET));
        tty_flip_buffer_push(tport);
 }
@@ -233,7 +284,7 @@ static void mvebu_uart_tx_chars(struct uart_port *port, unsigned int status)
        unsigned int st;
        if (port->x_char) {
-                writel(port->x_char, port->membase + UART_TSH);
+                writel(port->x_char, port->membase + UART_TSH(port));
                port->icount.tx++;
                port->x_char = 0;
                return;
@@ -245,7 +296,7 @@ static void mvebu_uart_tx_chars(struct uart_port *port, unsigned int status)
        }
        for (count = 0; count < port->fifosize; count++) {
-                writel(xmit->buf[xmit->tail], port->membase + UART_TSH);
+                writel(xmit->buf[xmit->tail], port->membase + UART_TSH(port));
                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
                port->icount.tx++;
@@ -269,10 +320,34 @@ static irqreturn_t mvebu_uart_isr(int irq, void *dev_id)
        struct uart_port *port = (struct uart_port *)dev_id;
        unsigned int st = readl(port->membase + UART_STAT);
-        if (st & (STAT_RX_RDY | STAT_OVR_ERR | STAT_FRM_ERR | STAT_BRK_DET))
+        if (st & (STAT_RX_RDY(port) | STAT_OVR_ERR | STAT_FRM_ERR |
+                  STAT_BRK_DET))
                mvebu_uart_rx_chars(port, st);
-        if (st & STAT_TX_RDY)
+        if (st & STAT_TX_RDY(port))
+                mvebu_uart_tx_chars(port, st);
+        return IRQ_HANDLED;
+}
+static irqreturn_t mvebu_uart_rx_isr(int irq, void *dev_id)
+{
+        struct uart_port *port = (struct uart_port *)dev_id;
+        unsigned int st = readl(port->membase + UART_STAT);
+        if (st & (STAT_RX_RDY(port) | STAT_OVR_ERR | STAT_FRM_ERR |
+                        STAT_BRK_DET))
+                mvebu_uart_rx_chars(port, st);
+        return IRQ_HANDLED;
+}
+static irqreturn_t mvebu_uart_tx_isr(int irq, void *dev_id)
+{
+        struct uart_port *port = (struct uart_port *)dev_id;
+        unsigned int st = readl(port->membase + UART_STAT);
+        if (st & STAT_TX_RDY(port))
                mvebu_uart_tx_chars(port, st);
        return IRQ_HANDLED;
@@ -280,18 +355,57 @@ static irqreturn_t mvebu_uart_isr(int irq, void *dev_id)
 static int mvebu_uart_startup(struct uart_port *port)
 {
+        struct mvebu_uart *mvuart = to_mvuart(port);
+        unsigned int ctl;
        int ret;
        writel(CTRL_TXFIFO_RST | CTRL_RXFIFO_RST,
-               port->membase + UART_CTRL);
+               port->membase + UART_CTRL(port));
        udelay(1);
-        writel(CTRL_RX_INT, port->membase + UART_CTRL);
-        ret = request_irq(port->irq, mvebu_uart_isr, port->irqflags, "serial",
+        /* Clear the error bits of state register before IRQ request */
-                          port);
+        ret = readl(port->membase + UART_STAT);
-        if (ret) {
+        ret |= STAT_BRK_ERR;
-                dev_err(port->dev, "failed to request irq\n");
+        writel(ret, port->membase + UART_STAT);
-                return ret;
+        writel(CTRL_BRK_INT, port->membase + UART_CTRL(port));
+        ctl = readl(port->membase + UART_INTR(port));
+        ctl |= CTRL_RX_RDY_INT(port);
+        writel(ctl, port->membase + UART_INTR(port));
+        if (!mvuart->irq[UART_TX_IRQ]) {
+                /* Old bindings with just one interrupt (UART0 only) */
+                ret = devm_request_irq(port->dev, mvuart->irq[UART_IRQ_SUM],
+                                       mvebu_uart_isr, port->irqflags,
+                                       dev_name(port->dev), port);
+                if (ret) {
+                        dev_err(port->dev, "unable to request IRQ %d\n",
+                                mvuart->irq[UART_IRQ_SUM]);
+                        return ret;
+                }
+        } else {
+                /* New bindings with an IRQ for RX and TX (both UART) */
+                ret = devm_request_irq(port->dev, mvuart->irq[UART_RX_IRQ],
+                                       mvebu_uart_rx_isr, port->irqflags,
+                                       dev_name(port->dev), port);
+                if (ret) {
+                        dev_err(port->dev, "unable to request IRQ %d\n",
+                                mvuart->irq[UART_RX_IRQ]);
+                        return ret;
+                }
+                ret = devm_request_irq(port->dev, mvuart->irq[UART_TX_IRQ],
+                                       mvebu_uart_tx_isr, port->irqflags,
+                                       dev_name(port->dev),
+                                       port);
+                if (ret) {
+                        dev_err(port->dev, "unable to request IRQ %d\n",
+                                mvuart->irq[UART_TX_IRQ]);
+                        devm_free_irq(port->dev, mvuart->irq[UART_RX_IRQ],
+                                      port);
+                        return ret;
+                }
        }
        return 0;
@@ -299,9 +413,41 @@ static int mvebu_uart_startup(struct uart_port *port)
 static void mvebu_uart_shutdown(struct uart_port *port)
 {
-        writel(0, port->membase + UART_CTRL);
+        struct mvebu_uart *mvuart = to_mvuart(port);
+        writel(0, port->membase + UART_INTR(port));
+        if (!mvuart->irq[UART_TX_IRQ]) {
+                devm_free_irq(port->dev, mvuart->irq[UART_IRQ_SUM], port);
+        } else {
+                devm_free_irq(port->dev, mvuart->irq[UART_RX_IRQ], port);
+                devm_free_irq(port->dev, mvuart->irq[UART_TX_IRQ], port);
+        }
+}
+static int mvebu_uart_baud_rate_set(struct uart_port *port, unsigned int baud)
+{
+        struct mvebu_uart *mvuart = to_mvuart(port);
+        unsigned int baud_rate_div;
+        u32 brdv;
+        if (IS_ERR(mvuart->clk))
+                return -PTR_ERR(mvuart->clk);
+        /*
+         * The UART clock is divided by the value of the divisor to generate
+         * UCLK_OUT clock, which is 16 times faster than the baudrate.
+         * This prescaler can achieve all standard baudrates until 230400.
+         * Higher baudrates could be achieved for the extended UART by using the
+         * programmable oversampling stack (also called fractional divisor).
+         */
+        baud_rate_div = DIV_ROUND_UP(port->uartclk, baud * 16);
+        brdv = readl(port->membase + UART_BRDV);
+        brdv &= ~BRDV_BAUD_MASK;
+        brdv |= baud_rate_div;
+        writel(brdv, port->membase + UART_BRDV);
-        free_irq(port->irq, port);
+        return 0;
 }
 static void mvebu_uart_set_termios(struct uart_port *port,
@@ -313,8 +459,8 @@ static void mvebu_uart_set_termios(struct uart_port *port,
        spin_lock_irqsave(&port->lock, flags);
-        port->read_status_mask = STAT_RX_RDY | STAT_OVR_ERR |
+        port->read_status_mask = STAT_RX_RDY(port) | STAT_OVR_ERR |
-                STAT_TX_RDY | STAT_TX_FIFO_FUL;
+                STAT_TX_RDY(port) | STAT_TX_FIFO_FUL;
        if (termios->c_iflag & INPCK)
                port->read_status_mask |= STAT_FRM_ERR | STAT_PAR_ERR;
@@ -325,13 +471,32 @@ static void mvebu_uart_set_termios(struct uart_port *port,
                        STAT_FRM_ERR | STAT_PAR_ERR | STAT_OVR_ERR;
        if ((termios->c_cflag & CREAD) == 0)
-                port->ignore_status_mask |= STAT_RX_RDY | STAT_BRK_ERR;
+                port->ignore_status_mask |= STAT_RX_RDY(port) | STAT_BRK_ERR;
-        if (old)
+        /*
-                tty_termios_copy_hw(termios, old);
+         * Maximum achievable frequency with simple baudrate divisor is 230400.
+         * Since the error per bit frame would be of more than 15%, achieving
+         * higher frequencies would require to implement the fractional divisor
+         * feature.
+         */
+        baud = uart_get_baud_rate(port, termios, old, 0, 230400);
+        if (mvebu_uart_baud_rate_set(port, baud)) {
+                /* No clock available, baudrate cannot be changed */
+                if (old)
+                        baud = uart_get_baud_rate(port, old, NULL, 0, 230400);
+        } else {
+                tty_termios_encode_baud_rate(termios, baud, baud);
+                uart_update_timeout(port, termios->c_cflag, baud);
+        }
-        baud = uart_get_baud_rate(port, termios, old, 0, 460800);
+        /* Only the following flag changes are supported */
-        uart_update_timeout(port, termios->c_cflag, baud);
+        if (old) {
+                termios->c_iflag &= INPCK | IGNPAR;
+                termios->c_iflag |= old->c_iflag & ~(INPCK | IGNPAR);
+                termios->c_cflag &= CREAD | CBAUD;
+                termios->c_cflag |= old->c_cflag & ~(CREAD | CBAUD);
+                termios->c_lflag = old->c_lflag;
+        }
        spin_unlock_irqrestore(&port->lock, flags);
 }
@@ -356,10 +521,10 @@ static int mvebu_uart_get_poll_char(struct uart_port *port)
 {
        unsigned int st = readl(port->membase + UART_STAT);
-        if (!(st & STAT_RX_RDY))
+        if (!(st & STAT_RX_RDY(port)))
                return NO_POLL_CHAR;
-        return readl(port->membase + UART_RBR);
+        return readl(port->membase + UART_RBR(port));
 }
 static void mvebu_uart_put_poll_char(struct uart_port *port, unsigned char c)
@@ -375,7 +540,7 @@ static void mvebu_uart_put_poll_char(struct uart_port *port, unsigned char c)
                udelay(1);
        }
-        writel(c, port->membase + UART_TSH);
+        writel(c, port->membase + UART_TSH(port));
 }
 #endif
@@ -413,7 +578,8 @@ static void mvebu_uart_putc(struct uart_port *port, int c)
                        break;
        }
-        writel(c, port->membase + UART_TSH);
+        /* At early stage, DT is not parsed yet, only use UART0 */
+        writel(c, port->membase + UART_STD_TSH);
        for (;;) {
                st = readl(port->membase + UART_STAT);
@@ -458,7 +624,7 @@ static void wait_for_xmitr(struct uart_port *port)
 static void mvebu_uart_console_putchar(struct uart_port *port, int ch)
 {
        wait_for_xmitr(port);
-        writel(ch, port->membase + UART_TSH);
+        writel(ch, port->membase + UART_TSH(port));
 }
 static void mvebu_uart_console_write(struct console *co, const char *s,
@@ -466,7 +632,7 @@ static void mvebu_uart_console_write(struct console *co, const char *s,
 {
        struct uart_port *port = &mvebu_uart_ports[co->index];
        unsigned long flags;
-        unsigned int ier;
+        unsigned int ier, intr, ctl;
        int locked = 1;
        if (oops_in_progress)
@@ -474,16 +640,23 @@ static void mvebu_uart_console_write(struct console *co, const char *s,
        else
                spin_lock_irqsave(&port->lock, flags);
-        ier = readl(port->membase + UART_CTRL) &
+        ier = readl(port->membase + UART_CTRL(port)) & CTRL_BRK_INT;
-                (CTRL_RX_INT | CTRL_TX_RDY_INT);
+        intr = readl(port->membase + UART_INTR(port)) &
-        writel(0, port->membase + UART_CTRL);
+                (CTRL_RX_RDY_INT(port) | CTRL_TX_RDY_INT(port));
+        writel(0, port->membase + UART_CTRL(port));
+        writel(0, port->membase + UART_INTR(port));
        uart_console_write(port, s, count, mvebu_uart_console_putchar);
        wait_for_xmitr(port);
        if (ier)
-                writel(ier, port->membase + UART_CTRL);
+                writel(ier, port->membase + UART_CTRL(port));
+        if (intr) {
+                ctl = intr | readl(port->membase + UART_INTR(port));
+                writel(ctl, port->membase + UART_INTR(port));
+        }
        if (locked)
                spin_unlock_irqrestore(&port->lock, flags);
@@ -538,7 +711,7 @@ console_initcall(mvebu_uart_console_init);
 static struct uart_driver mvebu_uart_driver = {
        .owner                  = THIS_MODULE,
-        .driver_name            = "mvebu_serial",
+        .driver_name            = DRIVER_NAME,
        .dev_name               = "ttyMV",
        .nr                     = MVEBU_NR_UARTS,
 #ifdef CONFIG_SERIAL_MVEBU_CONSOLE
@@ -546,20 +719,39 @@ static struct uart_driver mvebu_uart_driver = {
 #endif
 };
+static const struct of_device_id mvebu_uart_of_match[];
+/* Counter to keep track of each UART port id when not using CONFIG_OF */
+static int uart_num_counter;
 static int mvebu_uart_probe(struct platform_device *pdev)
 {
        struct resource *reg = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        struct resource *irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+        const struct of_device_id *match = of_match_device(mvebu_uart_of_match,
+                                                           &pdev->dev);
        struct uart_port *port;
-        struct mvebu_uart_data *data;
+        struct mvebu_uart *mvuart;
-        int ret;
+        int ret, id, irq;
+        if (!reg) {
+                dev_err(&pdev->dev, "no registers defined\n");
+                return -EINVAL;
+        }
+        /* Assume that all UART ports have a DT alias or none has */
+        id = of_alias_get_id(pdev->dev.of_node, "serial");
+        if (!pdev->dev.of_node || id < 0)
+                pdev->id = uart_num_counter++;
+        else
+                pdev->id = id;
-        if (!reg || !irq) {
+        if (pdev->id >= MVEBU_NR_UARTS) {
-                dev_err(&pdev->dev, "no registers/irq defined\n");
+                dev_err(&pdev->dev, "cannot have more than %d UART ports\n",
+                        MVEBU_NR_UARTS);
                return -EINVAL;
        }
-        port = &mvebu_uart_ports[0];
+        port = &mvebu_uart_ports[pdev->id];
        spin_lock_init(&port->lock);
@@ -571,9 +763,14 @@ static int mvebu_uart_probe(struct platform_device *pdev)
        port->fifosize   = 32;
        port->iotype     = UPIO_MEM32;
        port->flags      = UPF_FIXED_PORT;
-        port->line       = 0; /* single port: force line number to  0 */
+        port->line       = pdev->id;
-        port->irq        = irq->start;
+        /*
+         * IRQ number is not stored in this structure because we may have two of
+         * them per port (RX and TX). Instead, use the driver UART structure
+         * array so called ->irq[].
+         */
+        port->irq        = 0;
        port->irqflags   = 0;
        port->mapbase    = reg->start;
@@ -581,15 +778,70 @@ static int mvebu_uart_probe(struct platform_device *pdev)
        if (IS_ERR(port->membase))
                return -PTR_ERR(port->membase);
-        data = devm_kzalloc(&pdev->dev, sizeof(struct mvebu_uart_data),
+        mvuart = devm_kzalloc(&pdev->dev, sizeof(struct mvebu_uart),
-                            GFP_KERNEL);
+                              GFP_KERNEL);
-        if (!data)
+        if (!mvuart)
                return -ENOMEM;
-        data->port = port;
+        /* Get controller data depending on the compatible string */
+        mvuart->data = (struct mvebu_uart_driver_data *)match->data;
+        mvuart->port = port;
+        port->private_data = mvuart;
+        platform_set_drvdata(pdev, mvuart);
+        /* Get fixed clock frequency */
+        mvuart->clk = devm_clk_get(&pdev->dev, NULL);
+        if (IS_ERR(mvuart->clk)) {
+                if (PTR_ERR(mvuart->clk) == -EPROBE_DEFER)
+                        return PTR_ERR(mvuart->clk);
+                if (IS_EXTENDED(port)) {
+                        dev_err(&pdev->dev, "unable to get UART clock\n");
+                        return PTR_ERR(mvuart->clk);
+                }
+        } else {
+                if (!clk_prepare_enable(mvuart->clk))
+                        port->uartclk = clk_get_rate(mvuart->clk);
+        }
+        /* Manage interrupts */
+        if (platform_irq_count(pdev) == 1) {
+                /* Old bindings: no name on the single unamed UART0 IRQ */
+                irq = platform_get_irq(pdev, 0);
+                if (irq < 0) {
+                        dev_err(&pdev->dev, "unable to get UART IRQ\n");
+                        return irq;
+                }
+                mvuart->irq[UART_IRQ_SUM] = irq;
+        } else {
+                /*
+                 * New bindings: named interrupts (RX, TX) for both UARTS,
+                 * only make use of uart-rx and uart-tx interrupts, do not use
+                 * uart-sum of UART0 port.
+                 */
+                irq = platform_get_irq_byname(pdev, "uart-rx");
+                if (irq < 0) {
+                        dev_err(&pdev->dev, "unable to get 'uart-rx' IRQ\n");
+                        return irq;
+                }
+                mvuart->irq[UART_RX_IRQ] = irq;
-        port->private_data = data;
+                irq = platform_get_irq_byname(pdev, "uart-tx");
-        platform_set_drvdata(pdev, data);
+                if (irq < 0) {
+                        dev_err(&pdev->dev, "unable to get 'uart-tx' IRQ\n");
+                        return irq;
+                }
+                mvuart->irq[UART_TX_IRQ] = irq;
+        }
+        /* UART Soft Reset*/
+        writel(CTRL_SOFT_RST, port->membase + UART_CTRL(port));
+        udelay(1);
+        writel(0, port->membase + UART_CTRL(port));
        ret = uart_add_one_port(&mvebu_uart_driver, port);
        if (ret)
@@ -597,9 +849,40 @@ static int mvebu_uart_probe(struct platform_device *pdev)
        return 0;
 }
+static struct mvebu_uart_driver_data uart_std_driver_data = {
+        .is_ext = false,
+        .regs.rbr = UART_STD_RBR,
+        .regs.tsh = UART_STD_TSH,
+        .regs.ctrl = UART_STD_CTRL1,
+        .regs.intr = UART_STD_CTRL2,
+        .flags.ctrl_tx_rdy_int = CTRL_STD_TX_RDY_INT,
+        .flags.ctrl_rx_rdy_int = CTRL_STD_RX_RDY_INT,
+        .flags.stat_tx_rdy = STAT_STD_TX_RDY,
+        .flags.stat_rx_rdy = STAT_STD_RX_RDY,
+};
+static struct mvebu_uart_driver_data uart_ext_driver_data = {
+        .is_ext = true,
+        .regs.rbr = UART_EXT_RBR,
+        .regs.tsh = UART_EXT_TSH,
+        .regs.ctrl = UART_EXT_CTRL1,
+        .regs.intr = UART_EXT_CTRL2,
+        .flags.ctrl_tx_rdy_int = CTRL_EXT_TX_RDY_INT,
+        .flags.ctrl_rx_rdy_int = CTRL_EXT_RX_RDY_INT,
+        .flags.stat_tx_rdy = STAT_EXT_TX_RDY,
+        .flags.stat_rx_rdy = STAT_EXT_RX_RDY,
+};
 /* Match table for of_platform binding */
 static const struct of_device_id mvebu_uart_of_match[] = {
-        { .compatible = "marvell,armada-3700-uart", },
+        {
+                .compatible = "marvell,armada-3700-uart",
+                .data = (void *)&uart_std_driver_data,
+        },
+        {
+                .compatible = "marvell,armada-3700-uart-ext",
+                .data = (void *)&uart_ext_driver_data,
+        },
        {}
 };
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index be94246b6fcc..efb4fd3784ed 100644
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * Application UART driver for:
 *      Freescale STMP37XX/STMP378X
@@ -9,10 +10,6 @@
 *      Provide Alphascale ASM9260 support.
 * Copyright 2008-2010 Freescale Semiconductor, Inc.
 * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
 */
 #if defined(CONFIG_SERIAL_MXS_AUART_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
diff --git a/drivers/tty/serial/netx-serial.c b/drivers/tty/serial/netx-serial.c
index 207a0a032ed1..b3556863491f 100644
--- a/drivers/tty/serial/netx-serial.c
+++ b/drivers/tty/serial/netx-serial.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Copyright (c) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * 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
 */
 #if defined(CONFIG_SERIAL_NETX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 7754053deeda..53d59e9b944a 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * Driver for OMAP-UART controller.
 * Based on drivers/serial/8250.c
@@ -8,11 +9,6 @@
 *      Govindraj R     <govindraj.raja@ti.com>
 *      Thara Gopinath  <thara@ti.com>
 *
- * 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.
- *
 * Note: This driver is made separate from 8250 driver as we cannot
 * over load 8250 driver with omap platform specific configuration for
 * features like DMA, it makes easier to implement features like DMA and
@@ -610,7 +606,7 @@ static irqreturn_t serial_omap_irq(int irq, void *dev_id)
                default:
                        break;
                }
-        } while (!(iir & UART_IIR_NO_INT) && max_count--);
+        } while (max_count--);
        spin_unlock(&up->port.lock);
@@ -693,7 +689,7 @@ static void serial_omap_set_mctrl(struct uart_port *port, unsigned int mctrl)
        if ((mctrl & TIOCM_RTS) && (port->status & UPSTAT_AUTORTS))
                up->efr |= UART_EFR_RTS;
        else
-                up->efr &= UART_EFR_RTS;
+                up->efr &= ~UART_EFR_RTS;
        serial_out(up, UART_EFR, up->efr);
        serial_out(up, UART_LCR, lcr);
@@ -1606,7 +1602,6 @@ static int serial_omap_probe_rs485(struct uart_omap_port *up,
                                   struct device_node *np)
 {
        struct serial_rs485 *rs485conf = &up->port.rs485;
-        u32 rs485_delay[2];
        enum of_gpio_flags flags;
        int ret;
@@ -1637,17 +1632,7 @@ static int serial_omap_probe_rs485(struct uart_omap_port *up,
                up->rts_gpio = -EINVAL;
        }
-        if (of_property_read_u32_array(np, "rs485-rts-delay",
+        of_get_rs485_mode(np, rs485conf);
-                                    rs485_delay, 2) == 0) {
-                rs485conf->delay_rts_before_send = rs485_delay[0];
-                rs485conf->delay_rts_after_send = rs485_delay[1];
-        }
-        if (of_property_read_bool(np, "rs485-rx-during-tx"))
-                rs485conf->flags |= SER_RS485_RX_DURING_TX;
-        if (of_property_read_bool(np, "linux,rs485-enabled-at-boot-time"))
-                rs485conf->flags |= SER_RS485_ENABLED;
        return 0;
 }
diff --git a/drivers/tty/serial/owl-uart.c b/drivers/tty/serial/owl-uart.c
index b9c859365334..29a6dc6a8d23 100644
--- a/drivers/tty/serial/owl-uart.c
+++ b/drivers/tty/serial/owl-uart.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * Actions Semi Owl family serial console
 *
@@ -5,19 +6,6 @@
 * Author: Actions Semi, Inc.
 *
 * Copyright (c) 2016-2017 Andreas Färber
- *
- * 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, see <http://www.gnu.org/licenses/>.
 */
 #include <linux/clk.h>
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index d9123f995705..760d5dd0aada 100644
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 *Copyright (C) 2011 LAPIS Semiconductor Co., Ltd.
- *
- *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; version 2 of the License.
- *
- *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.
 */
 #if defined(CONFIG_SERIAL_PCH_UART_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
 #define SUPPORT_SYSRQ
diff --git a/drivers/tty/serial/pic32_uart.c b/drivers/tty/serial/pic32_uart.c
index 00a33eb859d3..fd80d999308d 100644
--- a/drivers/tty/serial/pic32_uart.c
+++ b/drivers/tty/serial/pic32_uart.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * PIC32 Integrated Serial Driver.
 *
@@ -5,8 +6,6 @@
 *
 * Authors:
 *   Sorin-Andrei Pistirica <andrei.pistirica@microchip.com>
- *
- * Licensed under GPLv2 or later.
 */
 #include <linux/kernel.h>
diff --git a/drivers/tty/serial/pic32_uart.h b/drivers/tty/serial/pic32_uart.h
index ec379da55ebb..2f2b56927dc6 100644
--- a/drivers/tty/serial/pic32_uart.h
+++ b/drivers/tty/serial/pic32_uart.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * PIC32 Integrated Serial Driver.
 *
@@ -5,8 +6,6 @@
 *
 * Authors:
 *   Sorin-Andrei Pistirica <andrei.pistirica@microchip.com>
- *
- * Licensed under GPLv2 or later.
 */
 #ifndef __DT_PIC32_UART_H__
 #define __DT_PIC32_UART_H__
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index 6ccdd018fb45..3d21790d961e 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * Driver for PowerMac Z85c30 based ESCC cell found in the
 * "macio" ASICs of various PowerMac models
@@ -13,20 +14,6 @@
 * and once done, I expect that driver to remain fairly stable in
 * the long term, unless we change the driver model again...
 *
- * 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
- *
 * 2004-08-06 Harald Welte <laforge@gnumonks.org>
 *      - Enable BREAK interrupt
 *      - Add support for sysreq
diff --git a/drivers/tty/serial/pnx8xxx_uart.c b/drivers/tty/serial/pnx8xxx_uart.c
index dab2668d3879..f8812389b8a8 100644
--- a/drivers/tty/serial/pnx8xxx_uart.c
+++ b/drivers/tty/serial/pnx8xxx_uart.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * UART driver for PNX8XXX SoCs
 *
@@ -7,11 +8,6 @@
 *
 * Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
 * Copyright (C) 2000 Deep Blue Solutions Ltd.
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of
- * any kind, whether express or implied.
- *
 */
 #if defined(CONFIG_SERIAL_PNX8XXX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
@@ -666,9 +662,8 @@ static void __init pnx8xxx_init_ports(void)
        first = 0;
        for (i = 0; i < NR_PORTS; i++) {
-                init_timer(&pnx8xxx_ports[i].timer);
+                setup_timer(&pnx8xxx_ports[i].timer, pnx8xxx_timeout,
-                pnx8xxx_ports[i].timer.function = pnx8xxx_timeout;
+                            (unsigned long)&pnx8xxx_ports[i]);
-                pnx8xxx_ports[i].timer.data     = (unsigned long)&pnx8xxx_ports[i];
                pnx8xxx_ports[i].port.ops = &pnx8xxx_pops;
        }
 }
diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c
index 905631df1f8b..baf552944d56 100644
--- a/drivers/tty/serial/pxa.c
+++ b/drivers/tty/serial/pxa.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  Based on drivers/serial/8250.c by Russell King.
 *
@@ -5,11 +6,6 @@
 *  Created:    Feb 20, 2003
 *  Copyright:  (C) 2003 Monta Vista Software, Inc.
 *
- * 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.
- *
 * Note 1: This driver is made separate from the already too overloaded
 * 8250.c because it needs some kirks of its own and that'll make it
 * easier to add DMA support.
diff --git a/drivers/tty/serial/rp2.c b/drivers/tty/serial/rp2.c
index 056f91b3a4ca..520b43b23543 100644
--- a/drivers/tty/serial/rp2.c
+++ b/drivers/tty/serial/rp2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Driver for Comtrol RocketPort EXPRESS/INFINITY cards
 *
@@ -10,10 +11,6 @@
 *
 *   rocketport_infinity_express-linux-1.20.tar.gz
 *     Copyright (C) 2004-2011 Comtrol, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
 */
 #include <linux/bitops.h>
diff --git a/drivers/tty/serial/sa1100.c b/drivers/tty/serial/sa1100.c
index fd3d1329d48c..4e3f169b30cf 100644
--- a/drivers/tty/serial/sa1100.c
+++ b/drivers/tty/serial/sa1100.c
@@ -1,23 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  Driver for SA11x0 serial ports
 *
 *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
 *
 *  Copyright (C) 2000 Deep Blue Solutions Ltd.
- *
- * 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
 */
 #if defined(CONFIG_SERIAL_SA1100_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
@@ -640,9 +627,8 @@ static void __init sa1100_init_ports(void)
                sa1100_ports[i].port.fifosize  = 8;
                sa1100_ports[i].port.line      = i;
                sa1100_ports[i].port.iotype    = UPIO_MEM;
-                init_timer(&sa1100_ports[i].timer);
+                setup_timer(&sa1100_ports[i].timer, sa1100_timeout,
-                sa1100_ports[i].timer.function = sa1100_timeout;
+                            (unsigned long)&sa1100_ports[i]);
-                sa1100_ports[i].timer.data     = (unsigned long)&sa1100_ports[i];
        }
        /*
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index 8aca18c4cdea..f9fecc5ed0ce 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Driver core for Samsung SoC onboard UARTs.
 *
 * Ben Dooks, Copyright (c) 2003-2008 Simtec Electronics
 *      http://armlinux.simtec.co.uk/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
 */
 /* Hote on 2410 error handling
diff --git a/drivers/tty/serial/samsung.h b/drivers/tty/serial/samsung.h
index 965199b6c16f..f93022113f59 100644
--- a/drivers/tty/serial/samsung.h
+++ b/drivers/tty/serial/samsung.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef __SAMSUNG_H
 #define __SAMSUNG_H
@@ -6,10 +7,6 @@
 *
 * Ben Dooks, Copyright (c) 2003-2008 Simtec Electronics
 *      http://armlinux.simtec.co.uk/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
 */
 #include <linux/dmaengine.h>
diff --git a/drivers/tty/serial/sb1250-duart.c b/drivers/tty/serial/sb1250-duart.c
index 041625cc24bb..329aced26bd8 100644
--- a/drivers/tty/serial/sb1250-duart.c
+++ b/drivers/tty/serial/sb1250-duart.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *      Support for the asynchronous serial interface (DUART) included
 *      in the BCM1250 and derived System-On-a-Chip (SOC) devices.
@@ -9,11 +10,6 @@
 *
 *      Copyright (c) 2000, 2001, 2002, 2003, 2004  Broadcom Corporation
 *
- *      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.
- *
 *      References:
 *
 *      "BCM1250/BCM1125/BCM1125H User Manual", Broadcom Corporation
diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
index ca54ce074a5f..65792a3539d0 100644
--- a/drivers/tty/serial/sc16is7xx.c
+++ b/drivers/tty/serial/sc16is7xx.c
@@ -1,14 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * SC16IS7xx tty serial driver - Copyright (C) 2014 GridPoint
 * Author: Jon Ringle <jringle@gridpoint.com>
 *
 *  Based on max310x.c, by Alexander Shiyan <shc_work@mail.ru>
- *
- * 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.
- *
 */
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/tty/serial/sccnxp.c b/drivers/tty/serial/sccnxp.c
index b9c7a904c1ea..d6ae3086c2a2 100644
--- a/drivers/tty/serial/sccnxp.c
+++ b/drivers/tty/serial/sccnxp.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  NXP (Philips) SCC+++(SCN+++) serial driver
 *
 *  Copyright (C) 2012 Alexander Shiyan <shc_work@mail.ru>
 *
 *  Based on sc26xx.c, by Thomas Bogendörfer (tsbogend@alpha.franken.de)
- *
- * 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.
 */
 #if defined(CONFIG_SERIAL_SCCNXP_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
@@ -465,9 +461,9 @@ static void sccnxp_handle_events(struct sccnxp_port *s)
        } while (1);
 }
-static void sccnxp_timer(unsigned long data)
+static void sccnxp_timer(struct timer_list *t)
 {
-        struct sccnxp_port *s = (struct sccnxp_port *)data;
+        struct sccnxp_port *s = from_timer(s, t, timer);
        unsigned long flags;
        spin_lock_irqsave(&s->lock, flags);
@@ -987,8 +983,7 @@ static int sccnxp_probe(struct platform_device *pdev)
                dev_err(&pdev->dev, "Unable to reguest IRQ %i\n", s->irq);
        } else {
-                init_timer(&s->timer);
+                timer_setup(&s->timer, sccnxp_timer, 0);
-                setup_timer(&s->timer, sccnxp_timer, (unsigned long)s);
                mod_timer(&s->timer, jiffies +
                          usecs_to_jiffies(s->pdata.poll_time_us));
                return 0;
diff --git a/drivers/tty/serial/serial-tegra.c b/drivers/tty/serial/serial-tegra.c
index cf9b736f26f8..af2a29cfbbe9 100644
--- a/drivers/tty/serial/serial-tegra.c
+++ b/drivers/tty/serial/serial-tegra.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * serial_tegra.c
 *
@@ -6,18 +7,6 @@
 * Copyright (c) 2012-2013, NVIDIA CORPORATION.  All rights reserved.
 *
 * Author: Laxman Dewangan <ldewangan@nvidia.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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, see <http://www.gnu.org/licenses/>.
 */
 #include <linux/clk.h>
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 3a14cccbd7ff..854995e1cae7 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  Driver core for serial ports
 *
@@ -5,20 +6,6 @@
 *
 *  Copyright 1999 ARM Limited
 *  Copyright (C) 2000-2001 Deep Blue Solutions Ltd.
- *
- * 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
 */
 #include <linux/module.h>
 #include <linux/tty.h>
@@ -1482,10 +1469,10 @@ out:
 static void uart_close(struct tty_struct *tty, struct file *filp)
 {
        struct uart_state *state = tty->driver_data;
-        struct tty_port *port;
        if (!state) {
                struct uart_driver *drv = tty->driver->driver_state;
+                struct tty_port *port;
                state = drv->state + tty->index;
                port = &state->port;
@@ -1495,7 +1482,6 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
                return;
        }
-        port = &state->port;
        pr_debug("uart_close(%d) called\n", tty->index);
        tty_port_close(tty->port, tty, filp);
@@ -3026,5 +3012,41 @@ EXPORT_SYMBOL(uart_resume_port);
 EXPORT_SYMBOL(uart_add_one_port);
 EXPORT_SYMBOL(uart_remove_one_port);
+/**
+ * of_get_rs485_mode() - Implement parsing rs485 properties
+ * @np: uart node
+ * @rs485conf: output parameter
+ *
+ * This function implements the device tree binding described in
+ * Documentation/devicetree/bindings/serial/rs485.txt.
+ */
+void of_get_rs485_mode(struct device_node *np, struct serial_rs485 *rs485conf)
+{
+        u32 rs485_delay[2];
+        int ret;
+        ret = of_property_read_u32_array(np, "rs485-rts-delay", rs485_delay, 2);
+        if (!ret) {
+                rs485conf->delay_rts_before_send = rs485_delay[0];
+                rs485conf->delay_rts_after_send = rs485_delay[1];
+        } else {
+                rs485conf->delay_rts_before_send = 0;
+                rs485conf->delay_rts_after_send = 0;
+        }
+        /*
+         * clear full-duplex and enabled flags to get to a defined state with
+         * the two following properties.
+         */
+        rs485conf->flags &= ~(SER_RS485_RX_DURING_TX | SER_RS485_ENABLED);
+        if (of_property_read_bool(np, "rs485-rx-during-tx"))
+                rs485conf->flags |= SER_RS485_RX_DURING_TX;
+        if (of_property_read_bool(np, "linux,rs485-enabled-at-boot-time"))
+                rs485conf->flags |= SER_RS485_ENABLED;
+}
+EXPORT_SYMBOL_GPL(of_get_rs485_mode);
 MODULE_DESCRIPTION("Serial driver core");
 MODULE_LICENSE("GPL");
diff --git a/drivers/tty/serial/serial_ks8695.c b/drivers/tty/serial/serial_ks8695.c
index 57f152394af5..b461d791188c 100644
--- a/drivers/tty/serial/serial_ks8695.c
+++ b/drivers/tty/serial/serial_ks8695.c
@@ -1,15 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  Driver for KS8695 serial ports
 *
 *  Based on drivers/serial/serial_amba.c, by Kam Lee.
 *
 *  Copyright 2002-2005 Micrel Inc.
- *
- * 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.
- *
 */
 #include <linux/module.h>
 #include <linux/tty.h>
diff --git a/drivers/tty/serial/serial_mctrl_gpio.c b/drivers/tty/serial/serial_mctrl_gpio.c
index d2da6aa7f27d..1c06325beaca 100644
--- a/drivers/tty/serial/serial_mctrl_gpio.c
+++ b/drivers/tty/serial/serial_mctrl_gpio.c
@@ -1,17 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * Helpers for controlling modem lines via GPIO
 *
 * Copyright (C) 2014 Paratronic S.A.
- *
- * 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.
 */
 #include <linux/err.h>
diff --git a/drivers/tty/serial/serial_mctrl_gpio.h b/drivers/tty/serial/serial_mctrl_gpio.h
index fa000bcff217..b7d3cca48ede 100644
--- a/drivers/tty/serial/serial_mctrl_gpio.h
+++ b/drivers/tty/serial/serial_mctrl_gpio.h
@@ -1,18 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * Helpers for controlling modem lines via GPIO
 *
 * Copyright (C) 2014 Paratronic S.A.
- *
- * 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.
- *
 */
 #ifndef __SERIAL_MCTRL_GPIO__
diff --git a/drivers/tty/serial/serial_txx9.c b/drivers/tty/serial/serial_txx9.c
index f80fead6c5fc..1b4008d022bf 100644
--- a/drivers/tty/serial/serial_txx9.c
+++ b/drivers/tty/serial/serial_txx9.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Derived from many drivers using generic_serial interface,
 * especially serial_tx3912.c by Steven J. Hill and r39xx_serial.c
@@ -8,10 +9,6 @@
 *  Copyright (C) 2001 Steven J. Hill (sjhill@realitydiluted.com)
 *  Copyright (C) 2000-2002 Toshiba Corporation
 *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
 *  Serial driver for TX3927/TX4927/TX4925/TX4938 internal SIO controller
 */
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 784dd42002ea..31fcc7072a90 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * SuperH on-chip serial module support.  (SCI with no FIFO / with FIFO)
 *
@@ -13,10 +14,6 @@
 *   Modified to support SecureEdge. David McCullough (2002)
 *   Modified to support SH7300 SCIF. Takashi Kusuda (Jun 2003).
 *   Removed SH7300 support (Jul 2007).
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
 */
 #if defined(CONFIG_SERIAL_SH_SCI_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
 #define SUPPORT_SYSRQ
@@ -40,6 +37,7 @@
 #include <linux/module.h>
 #include <linux/mm.h>
 #include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/scatterlist.h>
@@ -152,6 +150,7 @@ struct sci_port {
        int                             rx_trigger;
        struct timer_list               rx_fifo_timer;
        int                             rx_fifo_timeout;
+        u16                             hscif_tot;
        bool has_rtscts;
        bool autorts;
@@ -1107,8 +1106,14 @@ static ssize_t rx_fifo_timeout_show(struct device *dev,
 {
        struct uart_port *port = dev_get_drvdata(dev);
        struct sci_port *sci = to_sci_port(port);
+        int v;
+        if (port->type == PORT_HSCIF)
+                v = sci->hscif_tot >> HSSCR_TOT_SHIFT;
+        else
+                v = sci->rx_fifo_timeout;
-        return sprintf(buf, "%d\n", sci->rx_fifo_timeout);
+        return sprintf(buf, "%d\n", v);
 }
 static ssize_t rx_fifo_timeout_store(struct device *dev,
@@ -1124,11 +1129,19 @@ static ssize_t rx_fifo_timeout_store(struct device *dev,
        ret = kstrtol(buf, 0, &r);
        if (ret)
                return ret;
-        sci->rx_fifo_timeout = r;
-        scif_set_rtrg(port, 1);
+        if (port->type == PORT_HSCIF) {
-        if (r > 0)
+                if (r < 0 || r > 3)
-                setup_timer(&sci->rx_fifo_timer, rx_fifo_timer_fn,
+                        return -EINVAL;
-                            (unsigned long)sci);
+                sci->hscif_tot = r << HSSCR_TOT_SHIFT;
+        } else {
+                sci->rx_fifo_timeout = r;
+                scif_set_rtrg(port, 1);
+                if (r > 0)
+                        setup_timer(&sci->rx_fifo_timer, rx_fifo_timer_fn,
+                                    (unsigned long)sci);
+        }
        return count;
 }
@@ -1210,8 +1223,11 @@ static void sci_rx_dma_release(struct sci_port *s, bool enable_pio)
        dma_free_coherent(chan->device->dev, s->buf_len_rx * 2, s->rx_buf[0],
                          sg_dma_address(&s->sg_rx[0]));
        dma_release_channel(chan);
-        if (enable_pio)
+        if (enable_pio) {
+                spin_lock_irqsave(&port->lock, flags);
                sci_start_rx(port);
+                spin_unlock_irqrestore(&port->lock, flags);
+        }
 }
 static void sci_dma_rx_complete(void *arg)
@@ -1278,8 +1294,11 @@ static void sci_tx_dma_release(struct sci_port *s, bool enable_pio)
        dma_unmap_single(chan->device->dev, s->tx_dma_addr, UART_XMIT_SIZE,
                         DMA_TO_DEVICE);
        dma_release_channel(chan);
-        if (enable_pio)
+        if (enable_pio) {
+                spin_lock_irqsave(&port->lock, flags);
                sci_start_tx(port);
+                spin_unlock_irqrestore(&port->lock, flags);
+        }
 }
 static void sci_submit_rx(struct sci_port *s)
@@ -1491,6 +1510,14 @@ static void sci_request_dma(struct uart_port *port)
                return;
        s->cookie_tx = -EINVAL;
+        /*
+         * Don't request a dma channel if no channel was specified
+         * in the device tree.
+         */
+        if (!of_find_property(port->dev->of_node, "dmas", NULL))
+                return;
        chan = sci_request_dma_chan(port, DMA_MEM_TO_DEV);
        dev_dbg(port->dev, "%s: TX: got channel %p\n", __func__, chan);
        if (chan) {
@@ -1980,6 +2007,7 @@ static void sci_enable_ms(struct uart_port *port)
 static void sci_break_ctl(struct uart_port *port, int break_state)
 {
        unsigned short scscr, scsptr;
+        unsigned long flags;
        /* check wheter the port has SCSPTR */
        if (!sci_getreg(port, SCSPTR)->size) {
@@ -1990,6 +2018,7 @@ static void sci_break_ctl(struct uart_port *port, int break_state)
                return;
        }
+        spin_lock_irqsave(&port->lock, flags);
        scsptr = serial_port_in(port, SCSPTR);
        scscr = serial_port_in(port, SCSCR);
@@ -2003,6 +2032,7 @@ static void sci_break_ctl(struct uart_port *port, int break_state)
        serial_port_out(port, SCSPTR, scsptr);
        serial_port_out(port, SCSCR, scscr);
+        spin_unlock_irqrestore(&port->lock, flags);
 }
 static int sci_startup(struct uart_port *port)
@@ -2037,9 +2067,13 @@ static void sci_shutdown(struct uart_port *port)
        spin_lock_irqsave(&port->lock, flags);
        sci_stop_rx(port);
        sci_stop_tx(port);
-        /* Stop RX and TX, disable related interrupts, keep clock source */
+        /*
+         * Stop RX and TX, disable related interrupts, keep clock source
+         * and HSCIF TOT bits
+         */
        scr = serial_port_in(port, SCSCR);
-        serial_port_out(port, SCSCR, scr & (SCSCR_CKE1 | SCSCR_CKE0));
+        serial_port_out(port, SCSCR, scr &
+                        (SCSCR_CKE1 | SCSCR_CKE0 | s->hscif_tot));
        spin_unlock_irqrestore(&port->lock, flags);
 #ifdef CONFIG_SERIAL_SH_SCI_DMA
@@ -2186,7 +2220,7 @@ static void sci_reset(struct uart_port *port)
        unsigned int status;
        struct sci_port *s = to_sci_port(port);
-        serial_port_out(port, SCSCR, 0x00);     /* TE=0, RE=0, CKE1=0 */
+        serial_port_out(port, SCSCR, s->hscif_tot);     /* TE=0, RE=0, CKE1=0 */
        reg = sci_getreg(port, SCFCR);
        if (reg->size)
@@ -2227,6 +2261,7 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
        int min_err = INT_MAX, err;
        unsigned long max_freq = 0;
        int best_clk = -1;
+        unsigned long flags;
        if ((termios->c_cflag & CSIZE) == CS7)
                smr_val |= SCSMR_CHR;
@@ -2336,6 +2371,8 @@ done:
                serial_port_out(port, SCCKS, sccks);
        }
+        spin_lock_irqsave(&port->lock, flags);
        sci_reset(port);
        uart_update_timeout(port, termios->c_cflag, baud);
@@ -2353,10 +2390,7 @@ done:
                        case 27: smr_val |= SCSMR_SRC_27; break;
                        }
                smr_val |= cks;
-                dev_dbg(port->dev,
+                serial_port_out(port, SCSCR, scr_val | s->hscif_tot);
-                         "SCR 0x%x SMR 0x%x BRR %u CKS 0x%x DL %u SRR %u\n",
-                         scr_val, smr_val, brr, sccks, dl, srr);
-                serial_port_out(port, SCSCR, scr_val);
                serial_port_out(port, SCSMR, smr_val);
                serial_port_out(port, SCBRR, brr);
                if (sci_getreg(port, HSSRR)->size)
@@ -2369,8 +2403,7 @@ done:
                scr_val = s->cfg->scscr & (SCSCR_CKE1 | SCSCR_CKE0);
                smr_val |= serial_port_in(port, SCSMR) &
                           (SCSMR_CKEDG | SCSMR_SRC_MASK | SCSMR_CKS);
-                dev_dbg(port->dev, "SCR 0x%x SMR 0x%x\n", scr_val, smr_val);
+                serial_port_out(port, SCSCR, scr_val | s->hscif_tot);
-                serial_port_out(port, SCSCR, scr_val);
                serial_port_out(port, SCSMR, smr_val);
        }
@@ -2406,8 +2439,7 @@ done:
        scr_val |= SCSCR_RE | SCSCR_TE |
                   (s->cfg->scscr & ~(SCSCR_CKE1 | SCSCR_CKE0));
-        dev_dbg(port->dev, "SCSCR 0x%x\n", scr_val);
+        serial_port_out(port, SCSCR, scr_val | s->hscif_tot);
-        serial_port_out(port, SCSCR, scr_val);
        if ((srr + 1 == 5) &&
            (port->type == PORT_SCIFA || port->type == PORT_SCIFB)) {
                /*
@@ -2453,8 +2485,6 @@ done:
        s->rx_frame = (100 * bits * HZ) / (baud / 10);
 #ifdef CONFIG_SERIAL_SH_SCI_DMA
        s->rx_timeout = DIV_ROUND_UP(s->buf_len_rx * 2 * s->rx_frame, 1000);
-        dev_dbg(port->dev, "DMA Rx t-out %ums, tty t-out %u jiffies\n",
-                s->rx_timeout * 1000 / HZ, port->timeout);
        if (s->rx_timeout < msecs_to_jiffies(20))
                s->rx_timeout = msecs_to_jiffies(20);
 #endif
@@ -2462,6 +2492,8 @@ done:
        if ((termios->c_cflag & CREAD) != 0)
                sci_start_rx(port);
+        spin_unlock_irqrestore(&port->lock, flags);
        sci_port_disable(s);
        if (UART_ENABLE_MS(port, termios->c_cflag))
@@ -2773,6 +2805,7 @@ static int sci_init_single(struct platform_device *dev,
        }
        sci_port->rx_fifo_timeout = 0;
+        sci_port->hscif_tot = 0;
        /* SCIFA on sh7723 and sh7724 need a custom sampling rate that doesn't
         * match the SoC datasheet, this should be investigated. Let platform
@@ -2860,7 +2893,7 @@ static void serial_console_write(struct console *co, const char *s,
        ctrl_temp = SCSCR_RE | SCSCR_TE |
                    (sci_port->cfg->scscr & ~(SCSCR_CKE1 | SCSCR_CKE0)) |
                    (ctrl & (SCSCR_CKE1 | SCSCR_CKE0));
-        serial_port_out(port, SCSCR, ctrl_temp);
+        serial_port_out(port, SCSCR, ctrl_temp | sci_port->hscif_tot);
        uart_console_write(port, s, count, serial_console_putchar);
@@ -2988,7 +3021,8 @@ static int sci_remove(struct platform_device *dev)
                sysfs_remove_file(&dev->dev.kobj,
                                  &dev_attr_rx_fifo_trigger.attr);
        }
-        if (port->port.type == PORT_SCIFA || port->port.type == PORT_SCIFB) {
+        if (port->port.type == PORT_SCIFA || port->port.type == PORT_SCIFB ||
+            port->port.type == PORT_HSCIF) {
                sysfs_remove_file(&dev->dev.kobj,
                                  &dev_attr_rx_fifo_timeout.attr);
        }
@@ -3044,17 +3078,15 @@ static struct plat_sci_port *sci_parse_dt(struct platform_device *pdev,
                                          unsigned int *dev_id)
 {
        struct device_node *np = pdev->dev.of_node;
-        const struct of_device_id *match;
        struct plat_sci_port *p;
        struct sci_port *sp;
+        const void *data;
        int id;
        if (!IS_ENABLED(CONFIG_OF) || !np)
                return NULL;
-        match = of_match_node(of_sci_match, np);
+        data = of_device_get_match_data(&pdev->dev);
-        if (!match)
-                return NULL;
        p = devm_kzalloc(&pdev->dev, sizeof(struct plat_sci_port), GFP_KERNEL);
        if (!p)
@@ -3070,8 +3102,8 @@ static struct plat_sci_port *sci_parse_dt(struct platform_device *pdev,
        sp = &sci_ports[id];
        *dev_id = id;
-        p->type = SCI_OF_TYPE(match->data);
+        p->type = SCI_OF_TYPE(data);
-        p->regtype = SCI_OF_REGTYPE(match->data);
+        p->regtype = SCI_OF_REGTYPE(data);
        sp->has_rtscts = of_property_read_bool(np, "uart-has-rtscts");
@@ -3173,7 +3205,8 @@ static int sci_probe(struct platform_device *dev)
                if (ret)
                        return ret;
        }
-        if (sp->port.type == PORT_SCIFA || sp->port.type ==  PORT_SCIFB) {
+        if (sp->port.type == PORT_SCIFA || sp->port.type == PORT_SCIFB ||
+            sp->port.type == PORT_HSCIF) {
                ret = sysfs_create_file(&dev->dev.kobj,
                                &dev_attr_rx_fifo_timeout.attr);
                if (ret) {
@@ -3244,7 +3277,7 @@ early_platform_init_buffer("earlyprintk", &sci_driver,
                           early_serial_buf, ARRAY_SIZE(early_serial_buf));
 #endif
 #ifdef CONFIG_SERIAL_SH_SCI_EARLYCON
-static struct __init plat_sci_port port_cfg;
+static struct plat_sci_port port_cfg __initdata;
 static int __init early_console_setup(struct earlycon_device *device,
                                      int type)
diff --git a/drivers/tty/serial/sh-sci.h b/drivers/tty/serial/sh-sci.h
index 938e23a2d166..a5f792fd48d9 100644
--- a/drivers/tty/serial/sh-sci.h
+++ b/drivers/tty/serial/sh-sci.h
@@ -63,6 +63,9 @@ enum {
 #define SCSCR_TDRQE     BIT(15) /* Tx Data Transfer Request Enable */
 #define SCSCR_RDRQE     BIT(14) /* Rx Data Transfer Request Enable */
+/* Serial Control Register, HSCIF-only bits */
+#define HSSCR_TOT_SHIFT 14
 /* SCxSR (Serial Status Register) on SCI */
 #define SCI_TDRE        BIT(7)  /* Transmit Data Register Empty */
 #define SCI_RDRF        BIT(6)  /* Receive Data Register Full */
diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c
index 684cb8dd8050..9925b00a9777 100644
--- a/drivers/tty/serial/sirfsoc_uart.c
+++ b/drivers/tty/serial/sirfsoc_uart.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * Driver for CSR SiRFprimaII onboard UARTs.
 *
 * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company.
- *
- * Licensed under GPLv2 or later.
 */
 #include <linux/module.h>
diff --git a/drivers/tty/serial/sirfsoc_uart.h b/drivers/tty/serial/sirfsoc_uart.h
index 43756bd9111c..004ca684d3ae 100644
--- a/drivers/tty/serial/sirfsoc_uart.h
+++ b/drivers/tty/serial/sirfsoc_uart.h
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * Drivers for CSR SiRFprimaII onboard UARTs.
 *
 * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company.
- *
- * Licensed under GPLv2 or later.
 */
 #include <linux/bitops.h>
 #include <linux/log2.h>
diff --git a/drivers/tty/serial/sn_console.c b/drivers/tty/serial/sn_console.c
index 9e0e6586c698..ed78542c4c37 100644
--- a/drivers/tty/serial/sn_console.c
+++ b/drivers/tty/serial/sn_console.c
@@ -8,25 +8,6 @@
 *
 * Copyright (c) 2004-2006 Silicon Graphics, Inc.  All Rights Reserved.
 *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
 * Contact information:  Silicon Graphics, Inc., 1500 Crittenden Lane,
 * Mountain View, CA  94043, or:
 *
@@ -687,9 +668,7 @@ static void __init sn_sal_switch_to_asynch(struct sn_cons_port *port)
         * timer to poll for input and push data from the console
         * buffer.
         */
-        init_timer(&port->sc_timer);
+        setup_timer(&port->sc_timer, sn_sal_timer_poll, (unsigned long)port);
-        port->sc_timer.function = sn_sal_timer_poll;
-        port->sc_timer.data = (unsigned long)port;
        if (IS_RUNNING_ON_SIMULATOR())
                port->sc_interrupt_timeout = 6;
diff --git a/drivers/tty/serial/sprd_serial.c b/drivers/tty/serial/sprd_serial.c
index e902494ebbd5..828f1143859c 100644
--- a/drivers/tty/serial/sprd_serial.c
+++ b/drivers/tty/serial/sprd_serial.c
@@ -1,14 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Copyright (C) 2012-2015 Spreadtrum Communications Inc.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
 */
 #if defined(CONFIG_SERIAL_SPRD_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
diff --git a/drivers/tty/serial/st-asc.c b/drivers/tty/serial/st-asc.c
index b313a792b149..c763253514e9 100644
--- a/drivers/tty/serial/st-asc.c
+++ b/drivers/tty/serial/st-asc.c
@@ -1,13 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * st-asc.c: ST Asynchronous serial controller (ASC) driver
 *
 * Copyright (C) 2003-2013 STMicroelectronics (R&D) Limited
- *
- * 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.
- *
 */
 #if defined(CONFIG_SERIAL_ST_ASC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c
index 03a583264d9e..0fa735b60f2d 100644
--- a/drivers/tty/serial/stm32-usart.c
+++ b/drivers/tty/serial/stm32-usart.c
@@ -1,9 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Copyright (C) Maxime Coquelin 2015
 * Copyright (C) STMicroelectronics SA 2017
 * Authors:  Maxime Coquelin <mcoquelin.stm32@gmail.com>
 *           Gerald Baeza <gerald.baeza@st.com>
- * License terms:  GNU General Public License (GPL), version 2
 *
 * Inspired by st-asc.c from STMicroelectronics (c)
 */
@@ -736,11 +736,8 @@ static struct stm32_port *stm32_of_get_stm32_port(struct platform_device *pdev)
 #ifdef CONFIG_OF
 static const struct of_device_id stm32_match[] = {
-        { .compatible = "st,stm32-usart", .data = &stm32f4_info},
        { .compatible = "st,stm32-uart", .data = &stm32f4_info},
-        { .compatible = "st,stm32f7-usart", .data = &stm32f7_info},
        { .compatible = "st,stm32f7-uart", .data = &stm32f7_info},
-        { .compatible = "st,stm32h7-usart", .data = &stm32h7_info},
        { .compatible = "st,stm32h7-uart", .data = &stm32h7_info},
        {},
 };
diff --git a/drivers/tty/serial/stm32-usart.h b/drivers/tty/serial/stm32-usart.h
index ffc0c5285e51..8a5ff54d0f42 100644
--- a/drivers/tty/serial/stm32-usart.h
+++ b/drivers/tty/serial/stm32-usart.h
@@ -1,9 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Copyright (C) Maxime Coquelin 2015
 * Copyright (C) STMicroelectronics SA 2017
 * Authors:  Maxime Coquelin <mcoquelin.stm32@gmail.com>
 *           Gerald Baeza <gerald_baeza@yahoo.fr>
- * License terms:  GNU General Public License (GPL), version 2
 */
 #define DRIVER_NAME "stm32-usart"
diff --git a/drivers/tty/serial/suncore.c b/drivers/tty/serial/suncore.c
index 127472bd6a7c..70a4ea4eaa6e 100644
--- a/drivers/tty/serial/suncore.c
+++ b/drivers/tty/serial/suncore.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* suncore.c
 *
 * Common SUN serial routines.  Based entirely
diff --git a/drivers/tty/serial/sunhv.c b/drivers/tty/serial/sunhv.c
index 46e46894e918..63e34d868de8 100644
--- a/drivers/tty/serial/sunhv.c
+++ b/drivers/tty/serial/sunhv.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* sunhv.c: Serial driver for SUN4V hypervisor console.
 *
 * Copyright (C) 2006, 2007 David S. Miller (davem@davemloft.net)
diff --git a/drivers/tty/serial/sunsab.c b/drivers/tty/serial/sunsab.c
index 653a076d89d3..b93d0225f8c9 100644
--- a/drivers/tty/serial/sunsab.c
+++ b/drivers/tty/serial/sunsab.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* sunsab.c: ASYNC Driver for the SIEMENS SAB82532 DUSCC.
 *
 * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)
diff --git a/drivers/tty/serial/sunsu.c b/drivers/tty/serial/sunsu.c
index 95d34d7565c9..6cf3e9b0728f 100644
--- a/drivers/tty/serial/sunsu.c
+++ b/drivers/tty/serial/sunsu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * su.c: Small serial driver for keyboard/mouse interface on sparc32/PCI
 *
diff --git a/drivers/tty/serial/sunzilog.c b/drivers/tty/serial/sunzilog.c
index 252cea49c068..bc7af8b08a72 100644
--- a/drivers/tty/serial/sunzilog.c
+++ b/drivers/tty/serial/sunzilog.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* sunzilog.c: Zilog serial driver for Sparc systems.
 *
 * Driver for Zilog serial chips found on Sun workstations and
diff --git a/drivers/tty/serial/tilegx.c b/drivers/tty/serial/tilegx.c
index 453215f5420d..f0a3ae57f881 100644
--- a/drivers/tty/serial/tilegx.c
+++ b/drivers/tty/serial/tilegx.c
@@ -1,16 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Copyright 2013 Tilera Corporation. All Rights Reserved.
 *
- *   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, version 2.
- *
- *   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, GOOD TITLE or
- *   NON INFRINGEMENT.  See the GNU General Public License for
- *   more details.
- *
 * TILEGx UART driver.
 */
diff --git a/drivers/tty/serial/timbuart.c b/drivers/tty/serial/timbuart.c
index 5da7fe40e391..19d38b504e27 100644
--- a/drivers/tty/serial/timbuart.c
+++ b/drivers/tty/serial/timbuart.c
@@ -1,19 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * timbuart.c timberdale FPGA UART driver
 * Copyright (c) 2009 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 /* Supports:
diff --git a/drivers/tty/serial/timbuart.h b/drivers/tty/serial/timbuart.h
index 7e566766bc43..fb00b172117d 100644
--- a/drivers/tty/serial/timbuart.h
+++ b/drivers/tty/serial/timbuart.h
@@ -1,19 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * timbuart.c timberdale FPGA GPIO driver
 * Copyright (c) 2009 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 /* Supports:
diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
index c9b8d702dadc..c47db7826189 100644
--- a/drivers/tty/serial/uartlite.c
+++ b/drivers/tty/serial/uartlite.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * uartlite.c: Serial driver for Xilinx uartlite serial controller
 *
 * Copyright (C) 2006 Peter Korsgaard <jacmet@sunsite.dk>
 * Copyright (C) 2007 Secret Lab Technologies Ltd.
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
 */
 #include <linux/platform_device.h>
@@ -739,7 +736,7 @@ static int __init ulite_init(void)
 err_plat:
        uart_unregister_driver(&ulite_uart_driver);
 err_uart:
-        pr_err("registering uartlite driver failed: err=%i", ret);
+        pr_err("registering uartlite driver failed: err=%i\n", ret);
        return ret;
 }
diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c
index 55b702775786..2b6376e6e5ad 100644
--- a/drivers/tty/serial/ucc_uart.c
+++ b/drivers/tty/serial/ucc_uart.c
@@ -1,12 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Freescale QUICC Engine UART device driver
 *
 * Author: Timur Tabi <timur@freescale.com>
 *
- * Copyright 2007 Freescale Semiconductor, Inc.  This file is licensed under
+ * Copyright 2007 Freescale Semiconductor, Inc.
- * the terms of the GNU General Public License version 2.  This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
 *
 * This driver adds support for UART devices via Freescale's QUICC Engine
 * found on some Freescale SOCs.
diff --git a/drivers/tty/serial/vr41xx_siu.c b/drivers/tty/serial/vr41xx_siu.c
index 439057e8107a..6d106e33f842 100644
--- a/drivers/tty/serial/vr41xx_siu.c
+++ b/drivers/tty/serial/vr41xx_siu.c
@@ -1,23 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  Driver for NEC VR4100 series Serial Interface Unit.
 *
 *  Copyright (C) 2004-2008  Yoichi Yuasa <yuasa@linux-mips.org>
 *
 *  Based on drivers/serial/8250.c, by Russell King.
- *
- *  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
 */
 #if defined(CONFIG_SERIAL_VR41XX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c
index 435a6f3260be..3d58e9b34553 100644
--- a/drivers/tty/serial/vt8500_serial.c
+++ b/drivers/tty/serial/vt8500_serial.c
@@ -1,18 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>
 *
 * Based on msm_serial.c, which is:
 * Copyright (C) 2007 Google, Inc.
 * Author: Robert Love <rlove@google.com>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
 */
 #if defined(CONFIG_SERIAL_VT8500_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index 31a630ae0870..b9b2bc76bcac 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -1,14 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * Cadence UART driver (found in Xilinx Zynq)
 *
 * 2011 - 2014 (C) Xilinx Inc.
 *
- * 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 driver has originally been pushed by Xilinx using a Zynq-branding. This
 * still shows in the naming of this file, the kconfig symbols and some symbols
 * in the code.
@@ -1673,7 +1668,7 @@ static void __exit cdns_uart_exit(void)
        uart_unregister_driver(&cdns_uart_uart_driver);
 }
-module_init(cdns_uart_init);
+arch_initcall(cdns_uart_init);
 module_exit(cdns_uart_exit);
 MODULE_DESCRIPTION("Driver for Cadence UART");
diff --git a/drivers/tty/serial/zs.c b/drivers/tty/serial/zs.c
index d32bd499d684..b03d3e458ea2 100644
--- a/drivers/tty/serial/zs.c
+++ b/drivers/tty/serial/zs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * zs.c: Serial port driver for IOASIC DECstations.
 *
author	Linus Torvalds <torvalds@linux-foundation.org>	2017-11-14 00:05:31 -0500
committer	Linus Torvalds <torvalds@linux-foundation.org>	2017-11-14 00:05:31 -0500
commit	fb0255fb2941ef6f21742b2bc146d6b9aef4fedc (patch)
tree	8334f3485152b1c887ddfe04ba9a95c8a704481c /drivers/tty/serial
parent	449fcf3ab0baf3dde9952385e6789f2ca10c3980 (diff)
parent	57f5d648c45c3d40a3257c06629c14fd53c383bc (diff)