Commit 96b9b1c9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tty/serial updates from Greg KH:
 "Here's the big tty/serial driver pull request for 4.6-rc1.

  Lots of changes in here, Peter has been on a tear again, with lots of
  refactoring and bugs fixes, many thanks to the great work he has been
  doing.  Lots of driver updates and fixes as well, full details in the
  shortlog.

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

* tag 'tty-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (220 commits)
  serial: 8250: describe CONFIG_SERIAL_8250_RSA
  serial: samsung: optimize UART rx fifo access routine
  serial: pl011: add mark/space parity support
  serial: sa1100: make sa1100_register_uart_fns a function
  tty: serial: 8250: add MOXA Smartio MUE boards support
  serial: 8250: convert drivers to use up_to_u8250p()
  serial: 8250/mediatek: fix building with SERIAL_8250=m
  serial: 8250/ingenic: fix building with SERIAL_8250=m
  serial: 8250/uniphier: fix modular build
  Revert "drivers/tty/serial: make 8250/8250_ingenic.c explicitly non-modular"
  Revert "drivers/tty/serial: make 8250/8250_mtk.c explicitly non-modular"
  serial: mvebu-uart: initial support for Armada-3700 serial port
  serial: mctrl_gpio: Add missing module license
  serial: ifx6x60: avoid uninitialized variable use
  tty/serial: at91: fix bad offset for UART timeout register
  tty/serial: at91: restore dynamic driver binding
  serial: 8250: Add hardware dependency to RT288X option
  TTY, devpts: document pty count limiting
  tty: goldfish: support platform_device with id -1
  drivers: tty: goldfish: Add device tree bindings
  ...
parents 8eee93e2 a95fc9c8

Documentation/devicetree/bindings/goldfish/tty.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
Android Goldfish TTY



Android goldfish tty device generated by android emulator.



Required properties:



- compatible : should contain "google,goldfish-tty" to match emulator

- reg        : <registers mapping>

- interrupts : <interrupt mapping>



Example:



	goldfish_tty@1f004000 {

		compatible = "google,goldfish-tty";

		reg = <0x1f004000 0x1000>;

		interrupts = <0xc>;

	};

Documentation/devicetree/bindings/serial/brcm,bcm2835-aux-uart.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
* BCM2835 AUXILIAR UART



Required properties:



- compatible: "brcm,bcm2835-aux-uart"

- reg: The base address of the UART register bank.

- interrupts: A single interrupt specifier.

- clocks: Clock driving the hardware; used to figure out the baud rate

  divisor.



Example:



	uart1: serial@7e215040 {

		compatible = "brcm,bcm2835-aux-uart";

		reg = <0x7e215040 0x40>;

		interrupts = <1 29>;

		clocks = <&aux BCM2835_AUX_CLOCK_UART>;

	};

Documentation/devicetree/bindings/serial/renesas,sci-serial.txt

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ Required properties: 
    - "renesas,scifa-r8a7791" for R8A7791 (R-Car M2-W) SCIFA compatible UART.

    - "renesas,scifb-r8a7791" for R8A7791 (R-Car M2-W) SCIFB compatible UART.

    - "renesas,hscif-r8a7791" for R8A7791 (R-Car M2-W) HSCIF compatible UART.

    - "renesas,scif-r8a7792" for R8A7792 (R-Car V2H) SCIF compatible UART.

    - "renesas,hscif-r8a7792" for R8A7792 (R-Car V2H) HSCIF compatible UART.

    - "renesas,scif-r8a7793" for R8A7793 (R-Car M2-N) SCIF compatible UART.

    - "renesas,scifa-r8a7793" for R8A7793 (R-Car M2-N) SCIFA compatible UART.

    - "renesas,scifb-r8a7793" for R8A7793 (R-Car M2-N) SCIFB compatible UART.

Documentation/devicetree/bindings/tty/serial/mvebu-uart.txt

0 → 100644
+13 −0
Original line number Diff line number Diff line 
* Marvell UART : Non standard UART used in some of Marvell EBU SoCs (e.g., Armada-3700)



Required properties:

- compatible: "marvell,armada-3700-uart"

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

- interrupts: device interrupt



Example:

	serial@12000 {

		compatible = "marvell,armada-3700-uart";

		reg = <0x12000 0x400>;

		interrupts = <43>;

	};

Documentation/filesystems/devpts.txt

+9 −0
Original line number Diff line number Diff line
@@ -51,6 +51,15 @@ where 'ns_exec -cm /bin/bash' calls clone() with CLONE_NEWNS flag and execs 
/bin/bash in the child process.  A pty created by the sshd is not visible in

the original mount of /dev/pts.



Total count of pty pairs in all instances is limited by sysctls:

kernel.pty.max = 4096		- global limit

kernel.pty.reserve = 1024	- reserve for initial instance

kernel.pty.nr			- current count of ptys



Per-instance limit could be set by adding mount option "max=<count>".

This feature was added in kernel 3.4 together with sysctl kernel.pty.reserve.

In kernels older than 3.4 sysctl kernel.pty.max works as per-instance limit.



User-space changes

------------------

CRA Git | Maintained and supported by SUSTech CRA and CCSE