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

Commit 336722eb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tty-4.19-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 tty and serial driver pull request for 4.19-rc1.

  It's not all that big, just a number of small serial driver updates
  and fixes, along with some better vt handling for unicode characters
  for those using braille terminals.

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

* tag 'tty-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (73 commits)
  tty: serial: 8250: Revert NXP SC16C2552 workaround
  serial: 8250_exar: Read INT0 from slave device, too
  tty: rocket: Fix possible buffer overwrite on register_PCI
  serial: 8250_dw: Add ACPI support for uart on Broadcom SoC
  serial: 8250_dw: always set baud rate in dw8250_set_termios
  dt-bindings: serial: Add binding for uartlite
  tty: serial: uartlite: Add support for suspend and resume
  tty: serial: uartlite: Add clock adaptation
  tty: serial: uartlite: Add structure for private data
  serial: sh-sci: Improve support for separate TEI and DRI interrupts
  serial: sh-sci: Remove SCIx_RZ_SCIFA_REGTYPE
  serial: sh-sci: Allow for compressed SCIF address
  serial: sh-sci: Improve interrupts description
  serial: 8250: Use cached port name directly in messages
  serial: 8250_exar: Drop unused variable in pci_xr17v35x_setup()
  vt: drop unused struct vt_struct
  vt: avoid a VLA in the unicode screen scroll function
  vt: add /dev/vcsu* to devices.txt
  vt: coherence validation code for the unicode screen buffer
  vt: selection: take screen contents from uniscr if available
  ...
parents 5695d5d1 47ac7666

Documentation/admin-guide/devices.txt

+10 −6
Original line number Diff line number Diff line
@@ -173,14 +173,18 @@ 
		they are redirected through the parport multiplex layer.



   7 char	Virtual console capture devices

		  0 = /dev/vcs		Current vc text contents

		  1 = /dev/vcs1		tty1 text contents

		  0 = /dev/vcs		Current vc text (glyph) contents

		  1 = /dev/vcs1		tty1 text (glyph) contents

		    ...

		 63 = /dev/vcs63	tty63 text contents

		128 = /dev/vcsa		Current vc text/attribute contents

		129 = /dev/vcsa1	tty1 text/attribute contents

		 63 = /dev/vcs63	tty63 text (glyph) contents

		 64 = /dev/vcsu		Current vc text (unicode) contents

		65 = /dev/vcsu1		tty1 text (unicode) contents

		    ...

		191 = /dev/vcsa63	tty63 text/attribute contents

		127 = /dev/vcsu63	tty63 text (unicode) contents

		128 = /dev/vcsa		Current vc text/attribute (glyph) contents

		129 = /dev/vcsa1	tty1 text/attribute (glyph) contents

		    ...

		191 = /dev/vcsa63	tty63 text/attribute (glyph) contents



		NOTE: These devices permit both read and write access.

Documentation/devicetree/bindings/arm/mediatek.txt

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ compatible: Must contain one of 
   "mediatek,mt6589"

   "mediatek,mt6592"

   "mediatek,mt6755"

   "mediatek,mt6765"

   "mediatek,mt6795"

   "mediatek,mt6797"

   "mediatek,mt7622"
@@ -41,6 +42,9 @@ Supported boards: 
- Evaluation phone for MT6755(Helio P10):

    Required root node properties:

      - compatible = "mediatek,mt6755-evb", "mediatek,mt6755";

- Evaluation board for MT6765(Helio P22):

    Required root node properties:

      - compatible = "mediatek,mt6765-evb", "mediatek,mt6765";

- Evaluation board for MT6795(Helio X10):

    Required root node properties:

      - compatible = "mediatek,mt6795-evb", "mediatek,mt6795";

Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Required properties: 
	"mediatek,mt7622-sysirq", "mediatek,mt6577-sysirq": for MT7622

	"mediatek,mt6795-sysirq", "mediatek,mt6577-sysirq": for MT6795

	"mediatek,mt6797-sysirq", "mediatek,mt6577-sysirq": for MT6797

	"mediatek,mt6765-sysirq", "mediatek,mt6577-sysirq": for MT6765

	"mediatek,mt6755-sysirq", "mediatek,mt6577-sysirq": for MT6755

	"mediatek,mt6592-sysirq", "mediatek,mt6577-sysirq": for MT6592

	"mediatek,mt6589-sysirq", "mediatek,mt6577-sysirq": for MT6589

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

+5 −1
Original line number Diff line number Diff line
@@ -9,7 +9,11 @@ Optional properties: 
- fsl,dte-mode : Indicate the uart works in DTE mode. The uart works

                  in DCE mode by default.

- rs485-rts-delay, rs485-rts-active-low, rs485-rx-during-tx,

  linux,rs485-enabled-at-boot-time: see rs485.txt

  linux,rs485-enabled-at-boot-time: see rs485.txt. Note that for RS485

  you must enable either the "uart-has-rtscts" or the "rts-gpios"

  properties. In case you use "uart-has-rtscts" the signal that controls

  the transceiver is actually CTS_B, not RTS_B. CTS_B is always output,

  and RTS_B is input, regardless of dte-mode.



Please check Documentation/devicetree/bindings/serial/serial.txt

for the complete list of generic properties.

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

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Required properties: 
  * "mediatek,mt6582-uart" for MT6582 compatible UARTS

  * "mediatek,mt6589-uart" for MT6589 compatible UARTS

  * "mediatek,mt6755-uart" for MT6755 compatible UARTS

  * "mediatek,mt6765-uart" for MT6765 compatible UARTS

  * "mediatek,mt6795-uart" for MT6795 compatible UARTS

  * "mediatek,mt6797-uart" for MT6797 compatible UARTS

  * "mediatek,mt7622-uart" for MT7622 compatible UARTS