From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 4 Oct 2016 03:11:49 +0000 (-0700)
Subject: Merge tag 'tty-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Tag: v4.14-rc1~2394
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6dce825fba05f447bd22c865e27233182ab3d79;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull tty and serial updates from Greg KH:
 "Here is the big tty and serial patch set for 4.9-rc1.

  It also includes some drivers/dma/ changes, as those were needed by
  some serial drivers, and they were all acked by the DMA maintainer.

  Also in here is the long-suffering ACPI SPCR patchset, which was
  passed around from maintainer to maintainer like a hot-potato. Seems I
  was the sucker^Wlucky one. All of those patches have been acked by the
  various subsystem maintainers as well.

  All of this has been in linux-next with no reported issues"

* tag 'tty-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (111 commits)
  Revert "serial: pl011: add console matching function"
  MAINTAINERS: update entry for atmel_serial driver
  serial: pl011: add console matching function
  ARM64: ACPI: enable ACPI_SPCR_TABLE
  ACPI: parse SPCR and enable matching console
  of/serial: move earlycon early_param handling to serial
  Revert "drivers/tty: Explicitly pass current to show_stack"
  tty: amba-pl011: Don't complain on -EPROBE_DEFER when no irq
  nios2: dts: 10m50: Add tx-threshold parameter
  serial: 8250: Set Altera 16550 TX FIFO Threshold
  serial: 8250: of: Load TX FIFO Threshold from DT
  Documentation: dt: serial: Add TX FIFO threshold parameter
  drivers/tty: Explicitly pass current to show_stack
  serial: imx: Fix DCD reading
  serial: stm32: mark symbols static where possible
  serial: xuartps: Add some register initialisation to cdns_early_console_setup()
  serial: xuartps: Removed unwanted checks while reading the error conditions
  serial: xuartps: Rewrite the interrupt handling logic
  serial: stm32: use mapbase instead of membase for DMA
  tty/serial: atmel: fix fractional baud rate computation
  ...
---

e6dce825fba05f447bd22c865e27233182ab3d79
diff --cc arch/arm64/Kconfig
index 17c14a1d,11a2d36..7d6bcf6
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -4,7 -4,7 +4,8 @@@ config ARM6
  	select ACPI_GENERIC_GSI if ACPI
  	select ACPI_REDUCED_HARDWARE_ONLY if ACPI
  	select ACPI_MCFG if ACPI
+ 	select ACPI_SPCR_TABLE if ACPI
 +	select ARCH_CLOCKSOURCE_DATA
  	select ARCH_HAS_DEVMEM_IS_ALLOWED
  	select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI
  	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
diff --cc include/linux/acpi.h
index 19e650c,2353827..94afcb2c
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@@ -1093,10 -1074,10 +1093,16 @@@ void acpi_table_upgrade(void)
  static inline void acpi_table_upgrade(void) { }
  #endif
  
 +#if defined(CONFIG_ACPI) && defined(CONFIG_ACPI_WATCHDOG)
 +extern bool acpi_has_watchdog(void);
 +#else
 +static inline bool acpi_has_watchdog(void) { return false; }
 +#endif
 +
+ #ifdef CONFIG_ACPI_SPCR_TABLE
+ int parse_spcr(bool earlycon);
+ #else
+ static inline int parse_spcr(bool earlycon) { return 0; }
+ #endif
+ 
  #endif	/*_LINUX_ACPI_H*/