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

Merge tag 'tty-5.12-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 set of tty/serial driver changes for 5.12-rc1.

  Nothing huge, just lots of good cleanups and additions:

   - n_tty line discipline cleanups

   - vt core cleanups and reworks to make the code more "modern"

   - stm32 driver additions

   - tty led support added to the tty core and led layer

   - minor serial driver fixups and additions

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

* tag 'tty-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (54 commits)
  serial: core: Remove BUG_ON(in_interrupt()) check
  vt_ioctl: Remove in_interrupt() check
  dt-bindings: serial: imx: Switch to my personal address
  vt: keyboard, use new API for keyboard_tasklet
  serial: stm32: improve platform_get_irq condition handling in init_port
  serial: ifx6x60: Remove driver for deprecated platform
  tty: fix up iterate_tty_read() EOVERFLOW handling
  tty: fix up hung_up_tty_read() conversion
  tty: fix up hung_up_tty_write() conversion
  tty: teach the n_tty ICANON case about the new "cookie continuations" too
  tty: teach n_tty line discipline about the new "cookie continuations"
  tty: clean up legacy leftovers from n_tty line discipline
  tty: implement read_iter
  tty: convert tty_ldisc_ops 'read()' function to take a kernel pointer
  serial: remove sirf prima/atlas driver
  serial: mxs-auart: Remove <asm/cacheflush.h>
  serial: mxs-auart: Remove serial_mxs_probe_dt()
  serial: fsl_lpuart: Use of_device_get_match_data()
  dt-bindings: serial: renesas,hscif: Add r8a779a0 support
  tty: serial: Drop unused efm32 serial driver
  ...
parents 3342ff26 a157270f

Documentation/ABI/testing/sysfs-class-led-trigger-tty

0 → 100644
+6 −0
Original line number Diff line number Diff line 
What:		/sys/class/leds/<led>/ttyname

Date:		Dec 2020

KernelVersion:	5.10

Contact:	linux-leds@vger.kernel.org

Description:

		Specifies the tty device name of the triggering tty

Documentation/devicetree/bindings/serial/fsl-imx-uart.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Freescale i.MX Universal Asynchronous Receiver/Transmitter (UART)



maintainers:

  - Fabio Estevam <fabio.estevam@nxp.com>

  - Fabio Estevam <festevam@gmail.com>



allOf:

  - $ref: "serial.yaml"

Documentation/devicetree/bindings/serial/fsl-mxs-auart.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Freescale MXS Application UART (AUART)



maintainers:

  - Fabio Estevam <fabio.estevam@nxp.com>

  - Fabio Estevam <festevam@gmail.com>



allOf:

  - $ref: "serial.yaml"

Documentation/devicetree/bindings/serial/renesas,hscif.yaml

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ properties: 
              - renesas,hscif-r8a77980     # R-Car V3H

              - renesas,hscif-r8a77990     # R-Car E3

              - renesas,hscif-r8a77995     # R-Car D3

              - renesas,hscif-r8a779a0     # R-Car V3U

          - const: renesas,rcar-gen3-hscif # R-Car Gen3 and RZ/G2

          - const: renesas,hscif           # generic HSCIF compatible UART

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

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
* CSR SiRFprimaII/atlasVI Universal Synchronous Asynchronous Receiver/Transmitter *



Required properties:

- compatible : Should be "sirf,prima2-uart", "sirf, prima2-usp-uart",

		"sirf,atlas7-uart" or "sirf,atlas7-usp-uart".

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

- interrupts : Should contain uart interrupt

- fifosize : Should define hardware rx/tx fifo size

- clocks : Should contain uart clock number



Optional properties:

- uart-has-rtscts: we have hardware flow controller pins in hardware

- rts-gpios: RTS pin for USP-based UART if uart-has-rtscts is true

- cts-gpios: CTS pin for USP-based UART if uart-has-rtscts is true



Example:



uart0: uart@b0050000 {

	cell-index = <0>;

	compatible = "sirf,prima2-uart";

	reg = <0xb0050000 0x1000>;

	interrupts = <17>;

	fifosize = <128>;

	clocks = <&clks 13>;

};



On the board-specific dts, we can put rts-gpios and cts-gpios like



usp@b0090000 {

	compatible = "sirf,prima2-usp-uart";

	uart-has-rtscts;

	rts-gpios = <&gpio 15 0>;

	cts-gpios = <&gpio 46 0>;

};