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

Commit 49eb7b07 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  A variety of different serial driver fixes and updates and additions,
  nothing huge, and no real major core tty changes at all.

  All have been in linux-next for a while"

* tag 'tty-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (84 commits)
  Revert "serial: imx: remove the DMA wait queue"
  serial: kgdb_nmi: Improve console integration with KDB I/O
  serial: kgdb_nmi: Switch from tasklets to real timers
  serial: kgdb_nmi: Use container_of() to locate private data
  serial: cpm_uart: No LF conversion in put_poll_char()
  serial: sirf: Fix compilation failure
  console: Remove superfluous readonly check
  console: Use explicit pointer type for vc_uni_pagedir* fields
  vgacon: Fix & cleanup refcounting
  ARM: tty: Move HVC DCC assembly to arch/arm
  tty/hvc/hvc_console: Fix wakeup of HVC thread on hvc_kick()
  drivers/tty/n_hdlc.c: replace kmalloc/memset by kzalloc
  vt: emulate 8- and 24-bit colour codes.
  printk/of_serial: fix serial console cessation part way through boot.
  serial: 8250_dma: check the result of TX buffer mapping
  serial: uart: add hw flow control support configuration
  tty/serial: at91: add interrupts for modem control lines
  tty/serial: at91: use mctrl_gpio helpers
  tty/serial: Add GPIOLIB helpers for controlling modem lines
  ARM: at91: gpio: implement get_direction
  ...
parents 5142c33e 9ce4f8f3

Documentation/devicetree/bindings/serial/atmel-usart.txt

+9 −3
Original line number Diff line number Diff line
@@ -13,8 +13,9 @@ Required properties: 
Optional properties:

- atmel,use-dma-rx: use of PDC or DMA for receiving data

- atmel,use-dma-tx: use of PDC or DMA for transmitting data

- rts-gpios: specify a GPIO for RTS line. It will use specified PIO instead of the peripheral

  function pin for the USART RTS feature. If unsure, don't specify this property.

- {rts,cts,dtr,dsr,rng,dcd}-gpios: specify a GPIO for RTS/CTS/DTR/DSR/RI/DCD line respectively.

  It will use specified PIO instead of the peripheral function pin for the USART feature.

  If unsure, don't specify this property.

- add dma bindings for dma transfer:

	- dmas: DMA specifier, consisting of a phandle to DMA controller node,

		memory peripheral interface and USART DMA channel ID, FIFO configuration.
@@ -35,7 +36,12 @@ Example: 
		clock-names = "usart";

		atmel,use-dma-rx;

		atmel,use-dma-tx;

		rts-gpios = <&pioD 15 0>;

		rts-gpios = <&pioD 15 GPIO_ACTIVE_LOW>;

		cts-gpios = <&pioD 16 GPIO_ACTIVE_LOW>;

		dtr-gpios = <&pioD 17 GPIO_ACTIVE_LOW>;

		dsr-gpios = <&pioD 18 GPIO_ACTIVE_LOW>;

		dcd-gpios = <&pioD 20 GPIO_ACTIVE_LOW>;

		rng-gpios = <&pioD 19 GPIO_ACTIVE_LOW>;

	};



- use DMA:

Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt

0 → 100644
+33 −0
Original line number Diff line number Diff line 
* NXP SC16IS7xx advanced Universal Asynchronous Receiver-Transmitter (UART)



Required properties:

- compatible: Should be one of the following:

  - "nxp,sc16is740" for NXP SC16IS740,

  - "nxp,sc16is741" for NXP SC16IS741,

  - "nxp,sc16is750" for NXP SC16IS750,

  - "nxp,sc16is752" for NXP SC16IS752,

  - "nxp,sc16is760" for NXP SC16IS760,

  - "nxp,sc16is762" for NXP SC16IS762.

- reg: I2C address of the SC16IS7xx device.

- interrupt-parent: The phandle for the interrupt controller that

  services interrupts for this IC.

- interrupts: Should contain the UART interrupt

- clocks: Reference to the IC source clock.



Optional properties:

- gpio-controller: Marks the device node as a GPIO controller.

- #gpio-cells: Should be two. The first cell is the GPIO number and

  the second cell is used to specify the GPIO polarity:

    0 = active high,

    1 = active low.



Example:

        sc16is750: sc16is750@51 {

                compatible = "nxp,sc16is750";

                reg = <0x51>;

                clocks = <&clk20m>;

                interrupt-parent = <&gpio3>;

                interrupts = <7 IRQ_TYPE_EDGE_FALLING>;

                gpio-controller;

                #gpio-cells = <2>;

        };

Documentation/devicetree/bindings/serial/of-serial.txt

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 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.

- has-hw-flow-control: the hardware has flow control capability.



Example:

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

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Required properties: 


  - compatible: Must contain one of the following:



    - "renesas,scif-r8a7779" for R8A7779 (R-Car H1) SCIF compatible UART.

    - "renesas,scif-r8a7790" for R8A7790 (R-Car H2) SCIF compatible UART.

    - "renesas,scifa-r8a7790" for R8A7790 (R-Car H2) SCIFA compatible UART.

    - "renesas,scifb-r8a7790" for R8A7790 (R-Car H2) SCIFB compatible UART.

Documentation/kernel-parameters.txt

+9 −0
Original line number Diff line number Diff line
@@ -883,6 +883,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			which are not unmapped.



	earlycon=	[KNL] Output early console device and options.



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

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

		uart[8250],mmio32,<addr>[,options]
@@ -892,6 +893,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			(mmio) or 32-bit (mmio32).

			The options are the same as for ttyS, above.



		pl011,<addr>

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

			port at the specified address. The pl011 serial port

			must already be setup and configured. Options are not

			yet supported.



		smh	Use ARM semihosting calls for early console.



	earlyprintk=	[X86,SH,BLACKFIN,ARM,M68k]

			earlyprintk=vga

			earlyprintk=efi