From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Jun 2015 22:53:22 +0000 (-0700)
Subject: Merge tag 'tty-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Tag: firefly_0821_release~176^2~1544
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8c7febe83915332276cab49e89f6580bb963fb9a;p=firefly-linux-kernel-4.4.55.git

Merge tag 'tty-4.2-rc1' of git://git./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
  ...
---

8c7febe83915332276cab49e89f6580bb963fb9a
diff --cc drivers/tty/serial/sh-sci.c
index 95772cf4e7b0,b74a644e4b04..1b2f894bdc9e
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@@ -81,10 -81,11 +81,11 @@@ struct sci_port 
  
  	/* Platform configuration */
  	struct plat_sci_port	*cfg;
- 	int			overrun_bit;
+ 	unsigned int		overrun_reg;
+ 	unsigned int		overrun_mask;
  	unsigned int		error_mask;
  	unsigned int		sampling_rate;
 -
 +	resource_size_t		reg_size;
  
  	/* Break timer */
  	struct timer_list	break_timer;