From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 Dec 2012 15:45:16 +0000 (-0800)
Subject: Merge branch 'omap-serial' of git://git.linaro.org/people/rmk/linux-arm
X-Git-Tag: v3.8-rc1~160
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d07e43d70eef15a44a2c328a913d8d633a90e088;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'omap-serial' of git://git.linaro.org/people/rmk/linux-arm

Pull ARM OMAP serial updates from Russell King:
 "This series is a major reworking of the OMAP serial driver code fixing
  various bugs in the hardware-assisted flow control, extending up into
  serial_core for a couple of issues.  These fixes have been done as a
  set of progressive changes and transformations in the hope that no new
  bugs will be introduced by this series.

  The problems are many-fold, from the driver not being informed about
  updated settings, to the driver not knowing what the intentions of the
  upper layers are.

  The first four patches tackle the serial_core layer, allowing it to
  provide the necessary information to drivers, and the remaining
  patches allow the OMAP serial driver to take advantage of this.

  This brings hardware assisted RTS/CTS and XON/OFF flow control into a
  useful state.

  These patches have been in linux-next for most of the last cycle;
  indeed they predate the previous merge window.  They've also been
  posted to the OMAP people."

* 'omap-serial' of git://git.linaro.org/people/rmk/linux-arm: (21 commits)
  SERIAL: omap: fix hardware assisted flow control
  SERIAL: omap: simplify (2)
  SERIAL: omap: move xon/xoff setting earlier
  SERIAL: omap: always set TCR
  SERIAL: omap: simplify
  SERIAL: omap: don't read back LCR/MCR/EFR
  SERIAL: omap: serial_omap_configure_xonxoff() contents into set_termios
  SERIAL: omap: configure xon/xoff before setting modem control lines
  SERIAL: omap: remove OMAP_UART_SYSC_RESET and OMAP_UART_FIFO_CLR
  SERIAL: omap: move driver private definitions and structures to driver
  SERIAL: omap: remove 'irq_pending' bitfield
  SERIAL: omap: fix MCR TCRTLR bit handling
  SERIAL: omap: fix set_mctrl() breakage
  SERIAL: omap: no need to re-read EFR
  SERIAL: omap: remove setting of EFR SCD bit
  SERIAL: omap: allow hardware assisted IXANY mode to be disabled
  SERIAL: omap: allow hardware assisted rts/cts modes to be disabled
  SERIAL: core: add throttle/unthrottle callbacks for hardware assisted flow control
  SERIAL: core: add hardware assisted h/w flow control support
  SERIAL: core: add hardware assisted s/w flow control support
  ...

Conflicts:
	drivers/tty/serial/omap-serial.c
---

d07e43d70eef15a44a2c328a913d8d633a90e088
diff --cc drivers/tty/serial/omap-serial.c
index b538e2e4ae5b,4dbbc00c8266..23f797eb7a28
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@@ -96,10 -148,9 +148,9 @@@ struct uart_omap_port 
  	unsigned char		msr_saved_flags;
  	char			name[20];
  	unsigned long		port_activity;
 -	u32			context_loss_cnt;
 +	int			context_loss_cnt;
  	u32			errata;
  	u8			wakeups_enabled;
- 	unsigned int		irq_pending:1;
  
  	int			DTR_gpio;
  	int			DTR_inverted;