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

Pull tty/serial updates from Greg KH:
 "Here's the big tty/serial driver update for 4.1-rc1.

  It was delayed for a bit due to some questions surrounding some of the
  console command line parsing changes that are in here.  There's still
  one tiny regression for people who were previously putting multiple
  console command lines and expecting them all to be ignored for some
  odd reason, but Peter is working on fixing that.  If not, I'll send a
  revert for the offending patch, but I have faith that Peter can
  address it.

  Other than the console work here, there's the usual serial driver
  updates and changes, and a buch of 8250 reworks to try to make that
  driver easier to maintain over time, and have it support more devices
  in the future.

  All of these have been in linux-next for a while"

* tag 'tty-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (119 commits)
  n_gsm: Drop unneeded cast on netdev_priv
  sc16is7xx: expose RTS inversion in RS-485 mode
  serial: 8250_pci: port failed after wakeup from S3
  earlycon: 8250: Document kernel command line options
  earlycon: 8250: Fix command line regression
  earlycon: Fix __earlycon_table stride
  tty: clean up the tty time logic a bit
  serial: 8250_dw: only get the clock rate in one place
  serial: 8250_dw: remove useless ACPI ID check
  dmaengine: hsu: move memory allocation to GFP_NOWAIT
  dmaengine: hsu: remove redundant pieces of code
  serial: 8250_pci: add Intel Tangier support
  dmaengine: hsu: add Intel Tangier PCI ID
  serial: 8250_pci: replace switch-case by formula for Intel MID
  serial: 8250_pci: replace switch-case by formula
  tty: cpm_uart: replace CONFIG_8xx by CONFIG_CPM1
  serial: jsm: some off by one bugs
  serial: xuartps: Fix check in console_setup().
  serial: xuartps: Get rid of register access macros.
  serial: xuartps: Fix iobase use.
  ...

10 files changed, 115 insertions, 133 deletions

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 5c48c58514e5..8bd374d3cf21 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -153,6 +153,14 @@
 #define TRACE_SYSCALLS()
 #endif
 
+#ifdef CONFIG_SERIAL_EARLYCON
+#define EARLYCON_TABLE() STRUCT_ALIGN();                        \
+                         VMLINUX_SYMBOL(__earlycon_table) = .;  \
+                         *(__earlycon_table)                    \
+                         *(__earlycon_table_end)
+#else
+#define EARLYCON_TABLE()
+#endif
 
 #define ___OF_TABLE(cfg, name)  _OF_TABLE_##cfg(name)
 #define __OF_TABLE(cfg, name)   ___OF_TABLE(cfg, name)
@@ -508,6 +516,7 @@
         CPUIDLE_METHOD_OF_TABLES()                                      \
         KERNEL_DTB()                                                    \
         IRQCHIP_OF_MATCH_TABLE()                                        \
+        EARLYCON_TABLE()                                                \
         EARLYCON_OF_TABLES()
 
 #define INIT_TEXT                                                       \
diff --git a/include/linux/console.h b/include/linux/console.h
index 7571a16bd653..9f50fb413c11 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -123,7 +123,7 @@ struct console {
         struct tty_driver *(*device)(struct console *, int *);
         void    (*unblank)(void);
         int     (*setup)(struct console *, char *);
-        int     (*early_setup)(void);
+        int     (*match)(struct console *, char *name, int idx, char *options);
         short   flags;
         short   index;
         int     cflag;
@@ -141,7 +141,6 @@ extern int console_set_on_cmdline;
 extern struct console *early_console;
 
 extern int add_preferred_console(char *name, int idx, char *options);
-extern int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, char *options);
 extern void register_console(struct console *);
 extern int unregister_console(struct console *);
 extern struct console *console_drivers;
diff --git a/include/linux/dma/hsu.h b/include/linux/dma/hsu.h
new file mode 100644
index 000000000000..234393a6997b
--- /dev/null
+++ b/include/linux/dma/hsu.h
@@ -0,0 +1,48 @@
+/*
+ * Driver for the High Speed UART DMA
+ *
+ * Copyright (C) 2015 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.
+ */
+
+#ifndef _DMA_HSU_H
+#define _DMA_HSU_H
+
+#include <linux/device.h>
+#include <linux/interrupt.h>
+
+#include <linux/platform_data/dma-hsu.h>
+
+struct hsu_dma;
+
+/**
+ * struct hsu_dma_chip - representation of HSU DMA hardware
+ * @dev:                 struct device of the DMA controller
+ * @irq:                 irq line
+ * @regs:                memory mapped I/O space
+ * @length:              I/O space length
+ * @offset:              offset of the I/O space where registers are located
+ * @hsu:                 struct hsu_dma that is filed by ->probe()
+ * @pdata:               platform data for the DMA controller if provided
+ */
+struct hsu_dma_chip {
+        struct device                   *dev;
+        int                             irq;
+        void __iomem                    *regs;
+        unsigned int                    length;
+        unsigned int                    offset;
+        struct hsu_dma                  *hsu;
+        struct hsu_dma_platform_data    *pdata;
+};
+
+/* Export to the internal users */
+irqreturn_t hsu_dma_irq(struct hsu_dma_chip *chip, unsigned short nr);
+
+/* Export to the platform drivers */
+int hsu_dma_probe(struct hsu_dma_chip *chip);
+int hsu_dma_remove(struct hsu_dma_chip *chip);
+
+#endif /* _DMA_HSU_H */
diff --git a/include/linux/platform_data/dma-hsu.h b/include/linux/platform_data/dma-hsu.h
new file mode 100644
index 000000000000..8a1f6a4920b2
--- /dev/null
+++ b/include/linux/platform_data/dma-hsu.h
@@ -0,0 +1,25 @@
+/*
+ * Driver for the High Speed UART DMA
+ *
+ * Copyright (C) 2015 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.
+ */
+
+#ifndef _PLATFORM_DATA_DMA_HSU_H
+#define _PLATFORM_DATA_DMA_HSU_H
+
+#include <linux/device.h>
+
+struct hsu_dma_slave {
+        struct device   *dma_dev;
+        int             chan_id;
+};
+
+struct hsu_dma_platform_data {
+        unsigned short  nr_channels;
+};
+
+#endif /* _PLATFORM_DATA_DMA_HSU_H */
diff --git a/include/linux/platform_data/msm_serial_hs.h b/include/linux/platform_data/msm_serial_hs.h
deleted file mode 100644
index 98a2046f8b31..000000000000
--- a/include/linux/platform_data/msm_serial_hs.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2008 Google, Inc.
- * Author: Nick Pelly <npelly@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.
- */
-
-#ifndef __ASM_ARCH_MSM_SERIAL_HS_H
-#define __ASM_ARCH_MSM_SERIAL_HS_H
-
-#include <linux/serial_core.h>
-
-/* API to request the uart clock off or on for low power management
- * Clients should call request_clock_off() when no uart data is expected,
- * and must call request_clock_on() before any further uart data can be
- * received. */
-extern void msm_hs_request_clock_off(struct uart_port *uport);
-extern void msm_hs_request_clock_on(struct uart_port *uport);
-
-/**
- * struct msm_serial_hs_platform_data
- * @rx_wakeup_irq: Rx activity irq
- * @rx_to_inject: extra character to be inserted to Rx tty on wakeup
- * @inject_rx: 1 = insert rx_to_inject. 0 = do not insert extra character
- * @exit_lpm_cb: function called before every Tx transaction
- *
- * This is an optional structure required for UART Rx GPIO IRQ based
- * wakeup from low power state. UART wakeup can be triggered by RX activity
- * (using a wakeup GPIO on the UART RX pin). This should only be used if
- * there is not a wakeup GPIO on the UART CTS, and the first RX byte is
- * known (eg., with the Bluetooth Texas Instruments HCILL protocol),
- * since the first RX byte will always be lost. RTS will be asserted even
- * while the UART is clocked off in this mode of operation.
- */
-struct msm_serial_hs_platform_data {
-        int rx_wakeup_irq;
-        unsigned char inject_rx_on_wakeup;
-        char rx_to_inject;
-        void (*exit_lpm_cb)(struct uart_port *);
-};
-
-#endif
diff --git a/include/linux/platform_data/serial-imx.h b/include/linux/platform_data/serial-imx.h
index 3cc2e3c40914..a938eba2f18e 100644
--- a/include/linux/platform_data/serial-imx.h
+++ b/include/linux/platform_data/serial-imx.h
@@ -20,14 +20,9 @@
 #define ASMARM_ARCH_UART_H
 
 #define IMXUART_HAVE_RTSCTS (1<<0)
-#define IMXUART_IRDA        (1<<1)
 
 struct imxuart_platform_data {
         unsigned int flags;
-        void (*irda_enable)(int enable);
-        unsigned int irda_inv_rx:1;
-        unsigned int irda_inv_tx:1;
-        unsigned short transceiver_delay;
 };
 
 #endif
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h
index a8efa235b7c1..78097e7a330a 100644
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@@ -60,6 +60,20 @@ enum {
 };
 
 struct uart_8250_dma;
+struct uart_8250_port;
+
+/**
+ * 8250 core driver operations
+ *
+ * @setup_irq()         Setup irq handling. The universal 8250 driver links this
+ *                      port to the irq chain. Other drivers may @request_irq().
+ * @release_irq()       Undo irq handling. The universal 8250 driver unlinks
+ *                      the port from the irq chain.
+ */
+struct uart_8250_ops {
+        int             (*setup_irq)(struct uart_8250_port *);
+        void            (*release_irq)(struct uart_8250_port *);
+};
 
 /*
  * This should be used by drivers which want to register
@@ -88,6 +102,8 @@ struct uart_8250_port {
         unsigned char           canary;         /* non-zero during system sleep
                                                  *   if no_console_suspend
                                                  */
+        unsigned char           probe;
+#define UART_PROBE_RSA  (1 << 0)
 
         /*
          * Some bits in registers are cleared on a read, so they must
@@ -100,6 +116,7 @@ struct uart_8250_port {
         unsigned char           msr_saved_flags;
 
         struct uart_8250_dma    *dma;
+        const struct uart_8250_ops *ops;
 
         /* 8250 specific callbacks */
         int                     (*dl_read)(struct uart_8250_port *);
@@ -118,11 +135,8 @@ void serial8250_resume_port(int line);
 
 extern int early_serial_setup(struct uart_port *port);
 
-extern int serial8250_find_port(struct uart_port *p);
-extern int serial8250_find_port_for_earlycon(void);
 extern unsigned int serial8250_early_in(struct uart_port *port, int offset);
 extern void serial8250_early_out(struct uart_port *port, int offset, int value);
-extern int setup_early_serial8250_console(char *cmdline);
 extern void serial8250_do_set_termios(struct uart_port *port,
                 struct ktermios *termios, struct ktermios *old);
 extern int serial8250_do_startup(struct uart_port *port);
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index d10965f0d8a4..025dad9dcde4 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -235,7 +235,9 @@ struct uart_port {
         const struct uart_ops   *ops;
         unsigned int            custom_divisor;
         unsigned int            line;                   /* port index */
+        unsigned int            minor;
         resource_size_t         mapbase;                /* for ioremap */
+        resource_size_t         mapsize;
         struct device           *dev;                   /* parent device */
         unsigned char           hub6;                   /* this should be in the 8250 driver */
         unsigned char           suspended;
@@ -336,24 +338,29 @@ struct earlycon_device {
         char options[16];               /* e.g., 115200n8 */
         unsigned int baud;
 };
-int setup_earlycon(char *buf, const char *match,
-                   int (*setup)(struct earlycon_device *, const char *));
 
+struct earlycon_id {
+        char    name[16];
+        int     (*setup)(struct earlycon_device *, const char *options);
+} __aligned(32);
+
+extern int setup_earlycon(char *buf);
 extern int of_setup_earlycon(unsigned long addr,
                              int (*setup)(struct earlycon_device *, const char *));
 
-#define EARLYCON_DECLARE(name, func) \
-static int __init name ## _setup_earlycon(char *buf) \
-{ \
-        return setup_earlycon(buf, __stringify(name), func); \
-} \
-early_param("earlycon", name ## _setup_earlycon);
+#define EARLYCON_DECLARE(_name, func)                                   \
+        static const struct earlycon_id __earlycon_##_name              \
+                __used __section(__earlycon_table)                      \
+                 = { .name  = __stringify(_name),                       \
+                     .setup = func  }
 
 #define OF_EARLYCON_DECLARE(name, compat, fn)                           \
         _OF_DECLARE(earlycon, name, compat, fn, void *)
 
 struct uart_port *uart_get_console(struct uart_port *ports, int nr,
                                    struct console *c);
+int uart_parse_earlycon(char *p, unsigned char *iotype, unsigned long *addr,
+                        char **options);
 void uart_parse_options(char *options, int *baud, int *parity, int *bits,
                         int *flow);
 int uart_set_options(struct uart_port *port, struct console *co, int baud,
diff --git a/include/linux/serial_mfd.h b/include/linux/serial_mfd.h
deleted file mode 100644
index 2b071e0b034d..000000000000
--- a/include/linux/serial_mfd.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef _SERIAL_MFD_H_
-#define _SERIAL_MFD_H_
-
-/* HW register offset definition */
-#define UART_FOR        0x08
-#define UART_PS         0x0C
-#define UART_MUL        0x0D
-#define UART_DIV        0x0E
-
-#define HSU_GBL_IEN     0x0
-#define HSU_GBL_IST     0x4
-
-#define HSU_GBL_INT_BIT_PORT0   0x0
-#define HSU_GBL_INT_BIT_PORT1   0x1
-#define HSU_GBL_INT_BIT_PORT2   0x2
-#define HSU_GBL_INT_BIT_IRI     0x3
-#define HSU_GBL_INT_BIT_HDLC    0x4
-#define HSU_GBL_INT_BIT_DMA     0x5
-
-#define HSU_GBL_ISR     0x8
-#define HSU_GBL_DMASR   0x400
-#define HSU_GBL_DMAISR  0x404
-
-#define HSU_PORT_REG_OFFSET     0x80
-#define HSU_PORT0_REG_OFFSET    0x80
-#define HSU_PORT1_REG_OFFSET    0x100
-#define HSU_PORT2_REG_OFFSET    0x180
-#define HSU_PORT_REG_LENGTH     0x80
-
-#define HSU_DMA_CHANS_REG_OFFSET        0x500
-#define HSU_DMA_CHANS_REG_LENGTH        0x40
-
-#define HSU_CH_SR               0x0     /* channel status reg */
-#define HSU_CH_CR               0x4     /* control reg */
-#define HSU_CH_DCR              0x8     /* descriptor control reg */
-#define HSU_CH_BSR              0x10    /* max fifo buffer size reg */
-#define HSU_CH_MOTSR            0x14    /* minimum ocp transfer size */
-#define HSU_CH_D0SAR            0x20    /* desc 0 start addr */
-#define HSU_CH_D0TSR            0x24    /* desc 0 transfer size */
-#define HSU_CH_D1SAR            0x28
-#define HSU_CH_D1TSR            0x2C
-#define HSU_CH_D2SAR            0x30
-#define HSU_CH_D2TSR            0x34
-#define HSU_CH_D3SAR            0x38
-#define HSU_CH_D3TSR            0x3C
-
-#endif
diff --git a/include/uapi/linux/serial_reg.h b/include/uapi/linux/serial_reg.h
index 00adb01fa5f3..e9b4cb0cd7ed 100644
--- a/include/uapi/linux/serial_reg.h
+++ b/include/uapi/linux/serial_reg.h
@@ -242,25 +242,6 @@
 #define UART_FCR_PXAR32 0xc0    /* receive FIFO threshold = 32 */
 
 /*
- * Intel MID on-chip HSU (High Speed UART) defined bits
- */
-#define UART_FCR_HSU_64_1B      0x00    /* receive FIFO treshold = 1 */
-#define UART_FCR_HSU_64_16B     0x40    /* receive FIFO treshold = 16 */
-#define UART_FCR_HSU_64_32B     0x80    /* receive FIFO treshold = 32 */
-#define UART_FCR_HSU_64_56B     0xc0    /* receive FIFO treshold = 56 */
-
-#define UART_FCR_HSU_16_1B      0x00    /* receive FIFO treshold = 1 */
-#define UART_FCR_HSU_16_4B      0x40    /* receive FIFO treshold = 4 */
-#define UART_FCR_HSU_16_8B      0x80    /* receive FIFO treshold = 8 */
-#define UART_FCR_HSU_16_14B     0xc0    /* receive FIFO treshold = 14 */
-
-#define UART_FCR_HSU_64B_FIFO   0x20    /* chose 64 bytes FIFO */
-#define UART_FCR_HSU_16B_FIFO   0x00    /* chose 16 bytes FIFO */
-
-#define UART_FCR_HALF_EMPT_TXI  0x00    /* trigger TX_EMPT IRQ for half empty */
-#define UART_FCR_FULL_EMPT_TXI  0x08    /* trigger TX_EMPT IRQ for full empty */
-
-/*
  * These register definitions are for the 16C950
  */
 #define UART_ASR        0x01    /* Additional Status Register */