From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Nov 2015 05:35:12 +0000 (-0800)
Subject: Merge tag 'tty-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Tag: firefly_0821_release~176^2~803
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fd0d351de7bbd718bc2b34d5846854831aa2b88c;p=firefly-linux-kernel-4.4.55.git

Merge tag 'tty-4.4-rc1' of git://git./linux/kernel/git/gregkh/tty

Pull tty/serial driver updates from Greg KH:
 "Here is the big tty and serial driver update for 4.4-rc1.

  Lots of serial driver updates and a few small tty core changes.  Full
  details in the shortlog.

  All of these have been in linux-next for a while"

* tag 'tty-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (148 commits)
  tty: Use unbound workqueue for all input workers
  tty: Abstract tty buffer work
  tty: Prevent tty teardown during tty_write_message()
  tty: core: Use correct spinlock flavor in tiocspgrp()
  tty: Combine SIGTTOU/SIGTTIN handling
  serial: amba-pl011: fix incorrect integer size in pl011_fifo_to_tty()
  ttyFDC: Fix build problems due to use of module_{init,exit}
  tty: remove unneeded return statement
  serial: 8250_mid: add support for DMA engine handling from UART MMIO
  dmaengine: hsu: remove platform data
  dmaengine: hsu: introduce stubs for the exported functions
  dmaengine: hsu: make the UART driver in control of selecting this driver
  serial: fix mctrl helper functions
  serial: 8250_pci: Intel MID UART support to its own driver
  serial: fsl_lpuart: add earlycon support
  tty: disable unbind for old 74xx based serial/mpsc console port
  serial: pl011: Spelling s/clocks-names/clock-names/
  n_tty: Remove reader wakeups for TTY_BREAK/TTY_PARITY chars
  tty: synclink, fix indentation
  serial: at91, fix rs485 properties
  ...
---

fd0d351de7bbd718bc2b34d5846854831aa2b88c
diff --cc include/linux/platform_data/atmel.h
index bdc0ee8e84e9,c4bc90bfebe0..91b16adab0cd
--- a/include/linux/platform_data/atmel.h
+++ b/include/linux/platform_data/atmel.h
@@@ -19,12 -19,15 +19,6 @@@
  #include <linux/serial.h>
  #include <linux/platform_data/macb.h>
  
- /*
-  * at91: 6 USARTs and one DBGU port (SAM9260)
-  * avr32: 4
-  */
- #define ATMEL_MAX_UART	7
 - /* USB Device */
 -struct at91_udc_data {
 -	int	vbus_pin;		/* high == host powering us */
 -	u8	vbus_active_low;	/* vbus polarity */
 -	u8	vbus_polled;		/* Use polling, not interrupt */
 -	int	pullup_pin;		/* active == D+ pulled up */
 -	u8	pullup_active_low;	/* true == pullup_pin is active low */
 -};
--
   /* Compact Flash */
  struct at91_cf_data {
  	int	irq_pin;		/* I/O IRQ */