linux/arch/arm/plat-omap
Linus Torvalds d07e43d70e 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
2012-12-12 07:45:16 -08:00
..
include/plat Merge branch 'omap-serial' of git://git.linaro.org/people/rmk/linux-arm 2012-12-12 07:45:16 -08:00
clock.c ARM: OMAP2+: hwmod: get rid of all omap_clk_get_by_name usage 2012-09-22 10:50:01 -06:00
common.c ARM: omap: move platform_data definitions 2012-09-19 17:39:52 +02:00
counter_32k.c ARM: OMAP: counter: add locking to read_persistent_clock 2012-10-08 14:01:12 -07:00
debug-devices.c ARM: OMAP: resolve sparse warning concerning debug_card_init() 2012-10-16 14:05:50 -07:00
debug-leds.c ARM: soc: driver specific changes 2012-10-01 18:46:13 -07:00
dma.c These fixes are needed to fix non-omap build breakage for 2012-09-23 17:15:44 -06:00
dmtimer.c ARM: OMAP: dmtimers: Fix locking issue in omap_dm_timer_request*() 2012-08-13 06:23:16 -07:00
fb.c ARM: OMAP1: move lcd pdata out of arch/arm/* 2012-09-10 16:34:00 -07:00
i2c.c Revert "ARM: OMAP: convert I2C driver to PM QoS for MPU latency constraints" 2012-11-14 11:54:41 +01:00
Kconfig ARM: OMAP2+: Fix location of select PINCTRL 2012-10-22 13:37:34 -07:00
mailbox.c workqueue: deprecate flush[_delayed]_work_sync() 2012-08-20 14:51:24 -07:00
Makefile ARM: OMAP1: Make plat/mux.h omap1 only 2012-09-20 14:54:57 -07:00
omap_device.c OMAP PM related fixes for v3.7-rc 2012-10-08 15:57:41 -07:00
omap-pm-noop.c arch/arm/plat-omap/omap-pm-noop.c: Remove unecessary semicolon 2012-10-08 18:09:30 -07:00
sram.c These fixes are needed to fix non-omap build breakage for 2012-09-23 17:15:44 -06:00
sram.h OMAP: plat-omap: Fix static function warnings 2010-10-08 10:12:38 -07:00