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

Commit 37c85961 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tty-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty 

Pull tty/serial driver updates from Greg KH:
 "Here is the big tty/serial driver patchset for 4.11-rc1.

  Not much here, but a lot of little fixes and individual serial driver
  updates all over the subsystem. Majority are for the sh-sci driver and
  platform (the arch-specific changes have acks from the maintainer).

  The start of the "serial bus" code is here as well, but nothing is
  converted to use it yet. That work is still ongoing, hopefully will
  start to show up across different subsystems for 4.12 (bluetooth is
  one major place that will be used.)

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'tty-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (109 commits)
  tty: pl011: Work around QDF2400 E44 stuck BUSY bit
  atmel_serial: Use the fractional divider when possible
  tty: Remove extra include in HVC console tty framework
  serial: exar: Enable MSI support
  serial: exar: Move register defines from uapi header to consumer site
  serial: pci: Remove unused pci_boards entries
  serial: exar: Move Commtech adapters to 8250_exar as well
  serial: exar: Fix feature control register constants
  serial: exar: Fix initialization of EXAR registers for ports > 0
  serial: exar: Fix mapping of port I/O resources
  serial: sh-sci: fix hardware RX trigger level setting
  tty/serial: atmel: ensure state is restored after suspending
  serial: 8250_dw: Avoid "too much work" from bogus rx timeout interrupt
  serdev: ttyport: check whether tty_init_dev() fails
  serial: 8250_pci: make pciserial_detach_ports() static
  ARM: dts: STiH410-b2260: Enable HW flow-control
  ARM: dts: STiH407-family: Use new Pinctrl groups
  ARM: dts: STiH407-pinctrl: Add Pinctrl group for HW flow-control
  ARM: dts: STiH410-b2260: Identify the UART RTS line
  dt-bindings: serial: Update 'uart-has-rtscts' description
  ...
parents caa59428 d8a4995b

Documentation/admin-guide/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -957,6 +957,12 @@ 
			serial port must already be setup and configured.

			Options are not yet supported.



		lantiq,<addr>

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

			(lqasc) port at the specified address. The serial port

			must already be setup and configured. Options are not

			yet supported.



		lpuart,<addr>

		lpuart32,<addr>

			Use early console provided by Freescale LP UART driver

Documentation/devicetree/bindings/serial/8250.txt

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ Required properties: 
	- "altr,16550-FIFO128"

	- "fsl,16550-FIFO64"

	- "fsl,ns16550"

	- "ti,da830-uart"

	- "serial" if the port type is unknown.

- reg : offset and length of the register set for the device.

- interrupts : should contain uart interrupt.

Documentation/devicetree/bindings/serial/serial.txt

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ Optional properties: 
    they are available for use (wired and enabled by pinmux configuration).

    This depends on both the UART hardware and the board wiring.

    Note that this property is mutually-exclusive with "cts-gpios" and

    "rts-gpios" above.

    "rts-gpios" above, unless support is provided to switch between modes

    dynamically.





Examples:

Documentation/devicetree/bindings/serial/slave-device.txt

0 → 100644
+36 −0
Original line number Diff line number Diff line 
Serial Slave Device DT binding



This documents the binding structure and common properties for serial

attached devices. Common examples include Bluetooth, WiFi, NFC and GPS

devices.



Serial attached devices shall be a child node of the host UART device the

slave device is attached to. It is expected that the attached device is

the only child node of the UART device. The slave device node name shall

reflect the generic type of device for the node.



Required Properties:



- compatible 	: A string reflecting the vendor and specific device the node

		  represents.



Optional Properties:



- max-speed	: The maximum baud rate the device operates at. This should

		  only be present if the maximum is less than the slave device

		  can support. For example, a particular board has some signal

		  quality issue or the host processor can't support higher

		  baud rates.



Example:



serial@1234 {

	compatible = "ns16550a";

	interrupts = <1>;



	bluetooth {

		compatible = "brcm,bcm43341-bt";

		interrupt-parent = <&gpio>;

		interrupts = <10>;

	};

};

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -10927,6 +10927,14 @@ S: Maintained 
F:	Documentation/devicetree/bindings/serial/

F:	drivers/tty/serial/



SERIAL DEVICE BUS

M:	Rob Herring <robh@kernel.org>

L:	linux-serial@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/serial/slave-device.txt

F:	drivers/tty/serdev/

F:	include/linux/serdev.h



SERIAL IR RECEIVER

M:	Sean Young <sean@mess.org>

L:	linux-media@vger.kernel.org