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

Pull tty/serial driver updates from Greg KH:
 "Here's the tty and serial driver patches for 4.2-rc1.

  A number of individual driver updates, some code cleanups, and other
  minor things, full details in the shortlog.

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

* tag 'tty-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (152 commits)
  Doc: serial-rs485.txt: update RS485 driver interface
  Doc: tty.txt: remove mention of the BKL
  MAINTAINERS: tty: add serial docs directory
  serial: sprd: check for NULL after calling devm_clk_get
  serial: 8250_pci: Correct uartclk for xr17v35x expansion chips
  serial: 8250_pci: Add support for 12 port Exar boards
  serial: 8250_uniphier: add bindings document for UniPhier UART
  serial: core: cleanup in uart_get_baud_rate()
  serial: stm32-usart: Add STM32 USART Driver
  tty/serial: kill off set_irq_flags usage
  tty: move linux/gsmmux.h to uapi
  doc: dt: add documentation for nxp,lpc1850-uart
  serial: 8250: add LPC18xx/43xx UART driver
  serial: 8250_uniphier: add UniPhier serial driver
  serial: 8250_dw: support ACPI platforms with integrated DMA engine
  serial: of_serial: check the return value of clk_prepare_enable()
  serial: of_serial: use devm_clk_get() instead of clk_get()
  serial: earlycon: Add support for big-endian MMIO accesses
  serial: sirf: use hrtimer for data rx
  serial: sirf: correct the fifo empty_bit
  ...

9 files changed, 25 insertions, 78 deletions

diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h
index e859c98d1767..e329ee2667e1 100644
--- a/include/linux/console_struct.h
+++ b/include/linux/console_struct.h
@@ -104,6 +104,7 @@ struct vc_data {
         unsigned int    vc_resize_user;         /* resize request from user */
         unsigned int    vc_bell_pitch;          /* Console bell pitch */
         unsigned int    vc_bell_duration;       /* Console bell duration */
+        unsigned short  vc_cur_blink_ms;        /* Cursor blink duration */
         struct vc_data **vc_display_fg;         /* [!] Ptr to var holding fg console for this display */
         struct uni_pagedir *vc_uni_pagedir;
         struct uni_pagedir **vc_uni_pagedir_loc; /* [!] Location of uni_pagedir variable for this console */
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h
index 78097e7a330a..ba82c07feb95 100644
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@@ -12,6 +12,7 @@
 #define _LINUX_SERIAL_8250_H
 
 #include <linux/serial_core.h>
+#include <linux/serial_reg.h>
 #include <linux/platform_device.h>
 
 /*
@@ -137,6 +138,8 @@ extern int early_serial_setup(struct uart_port *port);
 
 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 early_serial8250_setup(struct earlycon_device *device,
+                                         const char *options);
 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 025dad9dcde4..297d4fa1cfe5 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -35,7 +35,7 @@
 #define uart_console(port) \
         ((port)->cons && (port)->cons->index == (port)->line)
 #else
-#define uart_console(port)      (0)
+#define uart_console(port)      ({ (void)port; 0; })
 #endif
 
 struct uart_port;
diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h
index 6c5e3bb282b0..7c536ac5be05 100644
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@ -1,6 +1,7 @@
 #ifndef __LINUX_SERIAL_SCI_H
 #define __LINUX_SERIAL_SCI_H
 
+#include <linux/bitops.h>
 #include <linux/serial_core.h>
 #include <linux/sh_dma.h>
 
@@ -10,59 +11,16 @@
 
 #define SCIx_NOT_SUPPORTED      (-1)
 
-/* SCSMR (Serial Mode Register) */
-#define SCSMR_CHR       (1 << 6)        /* 7-bit Character Length */
-#define SCSMR_PE        (1 << 5)        /* Parity Enable */
-#define SCSMR_ODD       (1 << 4)        /* Odd Parity */
-#define SCSMR_STOP      (1 << 3)        /* Stop Bit Length */
-#define SCSMR_CKS       0x0003          /* Clock Select */
-
 /* Serial Control Register (@ = not supported by all parts) */
-#define SCSCR_TIE       (1 << 7)        /* Transmit Interrupt Enable */
-#define SCSCR_RIE       (1 << 6)        /* Receive Interrupt Enable */
-#define SCSCR_TE        (1 << 5)        /* Transmit Enable */
-#define SCSCR_RE        (1 << 4)        /* Receive Enable */
-#define SCSCR_REIE      (1 << 3)        /* Receive Error Interrupt Enable @ */
-#define SCSCR_TOIE      (1 << 2)        /* Timeout Interrupt Enable @ */
-#define SCSCR_CKE1      (1 << 1)        /* Clock Enable 1 */
-#define SCSCR_CKE0      (1 << 0)        /* Clock Enable 0 */
-/* SCIFA/SCIFB only */
-#define SCSCR_TDRQE     (1 << 15)       /* Tx Data Transfer Request Enable */
-#define SCSCR_RDRQE     (1 << 14)       /* Rx Data Transfer Request Enable */
-
-/* SCxSR (Serial Status Register) on SCI */
-#define SCI_TDRE  0x80                  /* Transmit Data Register Empty */
-#define SCI_RDRF  0x40                  /* Receive Data Register Full */
-#define SCI_ORER  0x20                  /* Overrun Error */
-#define SCI_FER   0x10                  /* Framing Error */
-#define SCI_PER   0x08                  /* Parity Error */
-#define SCI_TEND  0x04                  /* Transmit End */
-
-#define SCI_DEFAULT_ERROR_MASK (SCI_PER | SCI_FER)
-
-/* SCxSR (Serial Status Register) on SCIF, HSCIF */
-#define SCIF_ER    0x0080               /* Receive Error */
-#define SCIF_TEND  0x0040               /* Transmission End */
-#define SCIF_TDFE  0x0020               /* Transmit FIFO Data Empty */
-#define SCIF_BRK   0x0010               /* Break Detect */
-#define SCIF_FER   0x0008               /* Framing Error */
-#define SCIF_PER   0x0004               /* Parity Error */
-#define SCIF_RDF   0x0002               /* Receive FIFO Data Full */
-#define SCIF_DR    0x0001               /* Receive Data Ready */
-
-#define SCIF_DEFAULT_ERROR_MASK (SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK)
-
-/* SCFCR (FIFO Control Register) */
-#define SCFCR_LOOP      (1 << 0)        /* Loopback Test */
-
-/* SCSPTR (Serial Port Register), optional */
-#define SCSPTR_RTSIO    (1 << 7)        /* Serial Port RTS Pin Input/Output */
-#define SCSPTR_CTSIO    (1 << 5)        /* Serial Port CTS Pin Input/Output */
-#define SCSPTR_SPB2IO   (1 << 1)        /* Serial Port Break Input/Output */
-#define SCSPTR_SPB2DT   (1 << 0)        /* Serial Port Break Data */
-
-/* HSSRR HSCIF */
-#define HSCIF_SRE       0x8000          /* Sampling Rate Register Enable */
+#define SCSCR_TIE       BIT(7)  /* Transmit Interrupt Enable */
+#define SCSCR_RIE       BIT(6)  /* Receive Interrupt Enable */
+#define SCSCR_TE        BIT(5)  /* Transmit Enable */
+#define SCSCR_RE        BIT(4)  /* Receive Enable */
+#define SCSCR_REIE      BIT(3)  /* Receive Error Interrupt Enable @ */
+#define SCSCR_TOIE      BIT(2)  /* Timeout Interrupt Enable @ */
+#define SCSCR_CKE1      BIT(1)  /* Clock Enable 1 */
+#define SCSCR_CKE0      BIT(0)  /* Clock Enable 0 */
+
 
 enum {
         SCIx_PROBE_REGTYPE,
@@ -82,28 +40,6 @@ enum {
         SCIx_NR_REGTYPES,
 };
 
-/*
- * SCI register subset common for all port types.
- * Not all registers will exist on all parts.
- */
-enum {
-        SCSMR,                          /* Serial Mode Register */
-        SCBRR,                          /* Bit Rate Register */
-        SCSCR,                          /* Serial Control Register */
-        SCxSR,                          /* Serial Status Register */
-        SCFCR,                          /* FIFO Control Register */
-        SCFDR,                          /* FIFO Data Count Register */
-        SCxTDR,                         /* Transmit (FIFO) Data Register */
-        SCxRDR,                         /* Receive (FIFO) Data Register */
-        SCLSR,                          /* Line Status Register */
-        SCTFDR,                         /* Transmit FIFO Data Count Register */
-        SCRFDR,                         /* Receive FIFO Data Count Register */
-        SCSPTR,                         /* Serial Port Register */
-        HSSRR,                          /* Sampling Rate Register */
-
-        SCIx_NR_REGS,
-};
-
 struct device;
 
 struct plat_sci_port_ops {
@@ -113,7 +49,7 @@ struct plat_sci_port_ops {
 /*
  * Port-specific capabilities
  */
-#define SCIx_HAVE_RTSCTS        (1 << 0)
+#define SCIx_HAVE_RTSCTS        BIT(0)
 
 /*
  * Platform device specific platform_data struct
diff --git a/include/linux/tty.h b/include/linux/tty.h
index d76631f615c2..ad6c8913aa3e 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -422,7 +422,7 @@ static inline struct tty_struct *tty_kref_get(struct tty_struct *tty)
 
 extern int tty_paranoia_check(struct tty_struct *tty, struct inode *inode,
                               const char *routine);
-extern char *tty_name(struct tty_struct *tty, char *buf);
+extern const char *tty_name(const struct tty_struct *tty);
 extern void tty_wait_until_sent(struct tty_struct *tty, long timeout);
 extern int tty_check_change(struct tty_struct *tty);
 extern void __stop_tty(struct tty_struct *tty);
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index baa7c80da6af..c1c23f19d4a2 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -138,6 +138,7 @@ header-y += genetlink.h
 header-y += gen_stats.h
 header-y += gfs2_ondisk.h
 header-y += gigaset_dev.h
+header-y += gsmmux.h
 header-y += hdlcdrv.h
 header-y += hdlc.h
 header-y += hdreg.h
diff --git a/include/linux/gsmmux.h b/include/uapi/linux/gsmmux.h
index c25e9477f7c3..c06742d52856 100644
--- a/include/linux/gsmmux.h
+++ b/include/uapi/linux/gsmmux.h
@@ -1,6 +1,9 @@
 #ifndef _LINUX_GSMMUX_H
 #define _LINUX_GSMMUX_H
 
+#include <linux/if.h>
+#include <linux/ioctl.h>
+
 struct gsm_config
 {
         unsigned int adaption;
diff --git a/include/uapi/linux/serial_core.h b/include/uapi/linux/serial_core.h
index b2122813f18a..93ba148f923e 100644
--- a/include/uapi/linux/serial_core.h
+++ b/include/uapi/linux/serial_core.h
@@ -258,4 +258,7 @@
 /* Cris v10 / v32 SoC */
 #define PORT_CRIS       112
 
+/* STM32 USART */
+#define PORT_STM32      113
+
 #endif /* _UAPILINUX_SERIAL_CORE_H */
diff --git a/include/uapi/linux/tty_flags.h b/include/uapi/linux/tty_flags.h
index fae4864737fa..072e41e45ee2 100644
--- a/include/uapi/linux/tty_flags.h
+++ b/include/uapi/linux/tty_flags.h
@@ -15,7 +15,7 @@
 #define ASYNCB_FOURPORT          1 /* Set OU1, OUT2 per AST Fourport settings */
 #define ASYNCB_SAK               2 /* Secure Attention Key (Orange book) */
 #define ASYNCB_SPLIT_TERMIOS     3 /* [x] Separate termios for dialin/callout */
-#define ASYNCB_SPD_HI            4 /* Use 56000 instead of 38400 bps */
+#define ASYNCB_SPD_HI            4 /* Use 57600 instead of 38400 bps */
 #define ASYNCB_SPD_VHI           5 /* Use 115200 instead of 38400 bps */
 #define ASYNCB_SKIP_TEST         6 /* Skip UART test during autoconfiguration */
 #define ASYNCB_AUTO_IRQ          7 /* Do automatic IRQ during