Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6dce825 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tty-4.9-rc1' of git://git.kernel.org/pub/scm/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
  ...
parents 9929780e 08bf2159

Documentation/devicetree/bindings/serial/8250.txt

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ Optional properties: 
- auto-flow-control: one way to enable automatic flow control support. The

  driver is allowed to detect support for the capability even without this

  property.

- tx-threshold: Specify the TX FIFO low water indication for parts with

  programmable TX FIFO thresholds.



Note:

* fsl,ns16550:

Documentation/devicetree/bindings/serial/st,stm32-usart.txt

0 → 100644
+46 −0
Original line number Diff line number Diff line 
* STMicroelectronics STM32 USART



Required properties:

- compatible: Can be either "st,stm32-usart", "st,stm32-uart",

"st,stm32f7-usart" or "st,stm32f7-uart" depending on whether

the device supports synchronous mode and is compatible with

stm32(f4) or stm32f7.

- reg: The address and length of the peripheral registers space

- interrupts: The interrupt line of the USART instance

- clocks: The input clock of the USART instance



Optional properties:

- pinctrl: The reference on the pins configuration

- st,hw-flow-ctrl: bool flag to enable hardware flow control.

- dmas: phandle(s) to DMA controller node(s). Refer to stm32-dma.txt

- dma-names: "rx" and/or "tx"



Examples:

usart4: serial@40004c00 {

	compatible = "st,stm32-uart";

	reg = <0x40004c00 0x400>;

	interrupts = <52>;

	clocks = <&clk_pclk1>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usart4>;

};



usart2: serial@40004400 {

	compatible = "st,stm32-usart", "st,stm32-uart";

	reg = <0x40004400 0x400>;

	interrupts = <38>;

	clocks = <&clk_pclk1>;

	st,hw-flow-ctrl;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usart2 &pinctrl_usart2_rtscts>;

};



usart1: serial@40011000 {

	compatible = "st,stm32-usart", "st,stm32-uart";

	reg = <0x40011000 0x400>;

	interrupts = <37>;

	clocks = <&rcc 0 164>;

	dmas = <&dma2 2 4 0x414 0x0>,

	       <&dma2 7 4 0x414 0x0>;

	dma-names = "rx", "tx";

};

Documentation/kernel-parameters.txt

+6 −5
Original line number Diff line number Diff line
@@ -1054,11 +1054,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			determined by the stdout-path property in device

			tree's chosen node.



		cdns,<addr>

			Start an early, polled-mode console on a cadence serial

			port at the specified address. The cadence serial port

			must already be setup and configured. Options are not

			yet supported.

		cdns,<addr>[,options]

			Start an early, polled-mode console on a Cadence

			(xuartps) serial port at the specified address. Only

			supported option is baud rate. If baud rate is not

			specified, the serial port must already be setup and

			configured.



		uart[8250],io,<addr>[,options]

		uart[8250],mmio,<addr>[,options]

MAINTAINERS

+6 −5
Original line number Diff line number Diff line
@@ -2121,11 +2121,6 @@ M: Ludovic Desroches <ludovic.desroches@atmel.com> 
S:	Maintained

F:	drivers/mmc/host/atmel-mci.c



ATMEL AT91 / AT32 SERIAL DRIVER

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

S:	Supported

F:	drivers/tty/serial/atmel_serial.c



ATMEL AT91 SAMA5D2-Compatible Shutdown Controller

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

S:	Supported
@@ -7774,6 +7769,12 @@ T: git git://git.monstr.eu/linux-2.6-microblaze.git 
S:	Supported

F:	arch/microblaze/



MICROCHIP / ATMEL AT91 / AT32 SERIAL DRIVER

M:	Richard Genoud <richard.genoud@gmail.com>

S:	Maintained

F:	drivers/tty/serial/atmel_serial.c

F:	include/linux/atmel_serial.h



MICROSOFT SURFACE PRO 3 BUTTON DRIVER

M:	Chen Yu <yu.c.chen@intel.com>

L:	platform-driver-x86@vger.kernel.org

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ config ARM64 
	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