• Linus Torvalds's avatar
    Merge branch 'omap-serial' of git://git.linaro.org/people/rmk/linux-arm · d07e43d7
    Linus Torvalds authored
    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
    d07e43d7
serial_core.c 70.3 KB