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

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

Pull tty/serial updates from Greg KH:
 "Here is the "big" set of tty/serial driver patches for 5.2-rc1.

  It's really pretty small, not much happening in this portion of the
  kernel at the moment. When the "highlight" is the movement of the
  documentation from .txt to .rst files, it's a good merge window.

  There's a number of small fixes and updates over the various serial
  drivers, and a new "tty null" driver for those embedded systems that
  like to make things even smaller and not break things.

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

* tag 'tty-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (45 commits)
  tty: serial: add driver for the SiFive UART
  dt-bindings: serial: add documentation for the SiFive UART driver
  serial: uartps: Add support for cts-override
  dt-bindings: xilinx-uartps: Add support for cts-override
  serial: milbeaut_usio: Fix error handling in probe and remove
  tty: rocket: deprecate the rp_ioctl
  tty: rocket: Remove RCPK_GET_STRUCT ioctl
  tty: update obsolete termios comment
  tty: serial_core: fix error code returned by uart_register_driver()
  serial: 8250-mtk: modify baudrate setting
  serial: 8250-mtk: add follow control
  docs: serial: convert docs to ReST and rename to *.rst
  serial: 8250_exar: Adjust IOT2000 matching
  TTY: serial_core, add ->install
  serial: Fix using plain integer instead of Null pointer
  tty:serial_core: Spelling mistake
  tty: Add NULL TTY driver
  tty: vt: keyboard: Allow Unicode compose base char
  Revert "tty: fix NULL pointer issue when tty_port ops is not set"
  serial: Add Milbeaut serial control
  ...
parents 132d68d3 45c054d0

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

+5 −0
Original line number Diff line number Diff line
@@ -12,6 +12,11 @@ Required properties: 
  See ../clocks/clock-bindings.txt for details.





Optional properties:

- cts-override : Override the CTS modem status signal. This signal will

  always be reported as active instead of being obtained from the modem status

  register. Define this if your serial port does not use this pin



Example:

	uart@e0000000 {

		compatible = "cdns,uart-r1p8";

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

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ Required properties: 
- reg: I2C address of the SC16IS7xx device.

- interrupts: Should contain the UART interrupt

- clocks: Reference to the IC source clock.

	OR (when there is no clock provider visible to the platform)

- clock-frequency: The source clock frequency for the IC.



Optional properties:

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

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

0 → 100644
+33 −0
Original line number Diff line number Diff line 
SiFive asynchronous serial interface (UART)



Required properties:



- compatible: should be something similar to

	      "sifive,<chip>-uart" for the UART as integrated

	      on a particular chip, and "sifive,uart<version>" for the

	      general UART IP block programming model.	Supported

	      compatible strings as of the date of this writing are:

	      "sifive,fu540-c000-uart" for the SiFive UART v0 as

	      integrated onto the SiFive FU540 chip, or "sifive,uart0"

	      for the SiFive UART v0 IP block with no chip integration

	      tweaks (if any)

- reg: address and length of the register space

- interrupts: Should contain the UART interrupt identifier

- clocks: Should contain a clock identifier for the UART's parent clock





UART HDL that corresponds to the IP block version numbers can be found

here:



https://github.com/sifive/sifive-blocks/tree/master/src/main/scala/devices/uart





Example:



uart0: serial@10010000 {

	compatible = "sifive,fu540-c000-uart", "sifive,uart0";

	interrupt-parent = <&plic0>;

	interrupts = <80>;

	reg = <0x0 0x10010000 0x0 0x1000>;

	clocks = <&prci PRCI_CLK_TLCLK>;

};

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

+15 −2
Original line number Diff line number Diff line
@@ -7,7 +7,17 @@ Required properties: 


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

- interrupts: exactly one interrupt specifier

- clocks: phandles to input clocks.

- clock-names: Should contain following entries:

  "enable" for UART module enable clock,

  "uart" for UART clock,

  "source" for UART source (parent) clock.

- clocks: Should contain a clock specifier for each entry in clock-names.

  UART clock and source clock are optional properties, but enable clock

  is required.



Optional properties:

- dma-names: Should contain "rx" for receive and "tx" for transmit channels.

- dmas: A list of dma specifiers, one for each entry in dma-names.



Example:

	uart0: serial@0 {
@@ -15,5 +25,8 @@ Example: 
			     "sprd,sc9836-uart";

		reg = <0x0 0x100>;

		interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&ext_26m>;

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

		dmas = <&ap_dma 19>, <&ap_dma 20>;

		clock-names = "enable", "uart", "source";

		clocks = <&clk_ap_apb_gates 9>, <&clk_uart0>, <&ext_26m>;

	};

Documentation/serial/README.cycladesZ→Documentation/serial/cyclades_z.rst

+4 −1
Original line number Diff line number Diff line 
================

Cyclades-Z notes

================



The Cyclades-Z must have firmware loaded onto the card before it will

operate.  This operation should be performed during system startup,



The firmware, loader program and the latest device driver code are

available from Cyclades at

    ftp://ftp.cyclades.com/pub/cyclades/cyclades-z/linux/



    ftp://ftp.cyclades.com/pub/cyclades/cyclades-z/linux/

CRA Git | Maintained and supported by SUSTech CRA and CCSE