Commit 67e79a6d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  It's really not all that big, nothing major here.

  There are a lot of tiny driver fixes and updates, combined with other
  cleanups for different serial drivers and the vt layer. Full details
  are in the shortlog.

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

* tag 'tty-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (70 commits)
  tty: xilinx_uartps: Correct return value in probe
  serial: sprd: Modify the baud rate calculation formula
  dt-bindings: serial: Add Milbeaut serial driver description
  serial: 8250_of: assume reg-shift of 2 for mrvl,mmp-uart
  serial: 8250_pxa: honor the port number from devicetree
  tty: hvc_xen: Mark expected switch fall-through
  tty: n_gsm: Mark expected switch fall-throughs
  tty: serial: msm_serial: Remove __init from msm_console_setup()
  tty: serial: samsung: Enable baud clock during initialisation
  serial: uartps: Fix stuck ISR if RX disabled with non-empty FIFO
  tty: serial: remove redundant likely annotation
  tty/n_hdlc: mark expected switch fall-through
  serial: 8250_pci: Have ACCES cards that use the four port Pericom PI7C9X7954 chip use the pci_pericom_setup()
  serial: 8250_pci: Fix number of ports for ACCES serial cards
  vt: perform safe console erase in the right order
  tty/nozomi: use pci_iomap instead of ioremap_nocache
  tty/synclink: remove ISA support
  serial: 8250_pci: Replace custom code with pci_match_id()
  serial: max310x: Correction of the initial setting of the MODE1 bits for various supported ICs.
  serial: mps2-uart: Add parentheses around conditional in mps2_uart_shutdown
  ...
parents e266ca36 f694936c

Documentation/devicetree/bindings/serial/8250.txt

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

	- "fsl,16550-FIFO64"

	- "fsl,ns16550"

	- "intel,xscale-uart"

	- "ti,da830-uart"

	- "aspeed,ast2400-vuart"

	- "aspeed,ast2500-vuart"

Documentation/devicetree/bindings/serial/ingenic,uart.txt

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ Required properties: 
  - "ingenic,jz4760-uart",

  - "ingenic,jz4770-uart",

  - "ingenic,jz4775-uart",

  - "ingenic,jz4780-uart".

  - "ingenic,jz4780-uart",

  - "ingenic,x1000-uart".

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

- interrupts : should contain uart interrupt.

- clocks : phandles to the module & baud clocks.

Documentation/devicetree/bindings/serial/milbeaut-uart.txt

0 → 100644
+21 −0
Original line number Diff line number Diff line 
Socionext Milbeaut UART controller



Required properties:

- compatible: should be "socionext,milbeaut-usio-uart".

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

- interrupts: two interrupts specifier.

- interrupt-names: should be "rx", "tx".

- clocks: phandle to the input clock.



Optional properties:

- auto-flow-control: flow control enable.



Example:

	usio1: usio_uart@1e700010 {

		compatible = "socionext,milbeaut-usio-uart";

		reg = <0x1e700010 0x10>;

		interrupts = <0 141 0x4>, <0 149 0x4>;

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

		clocks = <&clk 2>;

		auto-flow-control;

	};

Documentation/devicetree/bindings/serial/nvidia,tegra194-tcu.txt

0 → 100644
+35 −0
Original line number Diff line number Diff line 
NVIDIA Tegra Combined UART (TCU)



The TCU is a system for sharing a hardware UART instance among multiple

systems within the Tegra SoC. It is implemented through a mailbox-

based protocol where each "virtual UART" has a pair of mailboxes, one

for transmitting and one for receiving, that is used to communicate

with the hardware implementing the TCU.



Required properties:

- name : Should be tcu

- compatible

    Array of strings

    One of:

    - "nvidia,tegra194-tcu"

- mbox-names:

    "rx" - Mailbox for receiving data from hardware UART

    "tx" - Mailbox for transmitting data to hardware UART

- mboxes: Mailboxes corresponding to the mbox-names.



This node is a mailbox consumer. See the following files for details of

the mailbox subsystem, and the specifiers implemented by the relevant

provider(s):



- .../mailbox/mailbox.txt

- .../mailbox/nvidia,tegra186-hsp.txt



Example bindings:

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



tcu: tcu {

	compatible = "nvidia,tegra194-tcu";

	mboxes = <&hsp_top0 TEGRA_HSP_MBOX_TYPE_SM 0>,

	         <&hsp_aon TEGRA_HSP_MBOX_TYPE_SM 1>;

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

};

Documentation/devicetree/bindings/serial/omap_serial.txt

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ Optional properties: 
- dma-names : "rx" for receive channel, "tx" for transmit channel.

- rs485-rts-delay, rs485-rx-during-tx, linux,rs485-enabled-at-boot-time: see rs485.txt

- rs485-rts-active-high: drive RTS high when sending (default is low).

- clocks: phandle to the functional clock as per

  Documentation/devicetree/bindings/clock/clock-bindings.txt



Example:

CRA Git | Maintained and supported by SUSTech CRA and CCSE