Commit 537bd0a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  It's a bit later in the merge window than normal as I wanted to make
  sure some last-minute patches applied to it were all sane. They seem
  to be :)

  There's a lot of little stuff in here, for the tty core, and for lots
  of serial drivers:

   - reverts of uartlite serial driver patches that were wrong

   - msm-serial driver fixes

   - serial core updates and fixes

   - tty core fixes

   - serial driver dma mapping api changes

   - lots of other tiny fixes and updates for serial drivers

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

* tag 'tty-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (58 commits)
  Revert "serial/8250: Add support for NI-Serial PXI/PXIe+485 devices"
  vcs: prevent write access to vcsu devices
  tty: vt: keyboard: reject invalid keycodes
  tty: don't crash in tty_init_dev when missing tty_port
  serial: stm32: fix clearing interrupt error flags
  tty: Fix Kconfig indentation, continued
  serial: serial_core: Perform NULL checks for break_ctl ops
  tty: remove unused argument from tty_open_by_driver()
  tty: Fix Kconfig indentation
  {tty: serial, nand: onenand}: samsung: rename to fix build warning
  serial: ifx6x60: add missed pm_runtime_disable
  serial: pl011: Fix DMA ->flush_buffer()
  Revert "serial-uartlite: Move the uart register"
  Revert "serial-uartlite: Add get serial id if not provided"
  Revert "serial-uartlite: Do not use static struct uart_driver out of probe()"
  Revert "serial-uartlite: Add runtime support"
  Revert "serial-uartlite: Change logic how console_port is setup"
  Revert "serial-uartlite: Use allocated structure instead of static ones"
  tty: serial: msm_serial: Use dma_request_chan() directly for channel request
  tty: serial: tegra: Use dma_request_chan() directly for channel request
  ...
parents c3bed3b2 27ed14d0

Documentation/ABI/stable/sysfs-driver-aspeed-vuart

+10 −1
Original line number Diff line number Diff line
@@ -6,10 +6,19 @@ Description: Configures which IO port the host side of the UART 
Users:		OpenBMC.  Proposed changes should be mailed to

		openbmc@lists.ozlabs.org



What:		/sys/bus/platform/drivers/aspeed-vuart*/sirq

What:		/sys/bus/platform/drivers/aspeed-vuart/*/sirq

Date:		April 2017

Contact:	Jeremy Kerr <jk@ozlabs.org>

Description:	Configures which interrupt number the host side of

		the UART will appear on the host <-> BMC LPC bus.

Users:		OpenBMC.  Proposed changes should be mailed to

		openbmc@lists.ozlabs.org



What:		/sys/bus/platform/drivers/aspeed-vuart/*/sirq_polarity

Date:		July 2019

Contact:	Oskar Senft <osk@google.com>

Description:	Configures the polarity of the serial interrupt to the

		host via the BMC LPC bus.

		Set to 0 for active-low or 1 for active-high.

Users:		OpenBMC.  Proposed changes should be mailed to

		openbmc@lists.ozlabs.org

Documentation/admin-guide/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -1097,7 +1097,7 @@ 
			mapped with the correct attributes.



		linflex,<addr>

			Use early console provided by Freescale LinFlex UART

			Use early console provided by Freescale LINFlexD UART

			serial driver for NXP S32V234 SoCs. A valid base

			address must be provided, and the serial port must

			already be setup and configured.

Documentation/devicetree/bindings/serial/8250.txt

+5 −0
Original line number Diff line number Diff line
@@ -56,6 +56,11 @@ Optional properties: 
- {rts,cts,dtr,dsr,rng,dcd}-gpios: specify a GPIO for RTS/CTS/DTR/DSR/RI/DCD

  line respectively. It will use specified GPIO instead of the peripheral

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

- aspeed,sirq-polarity-sense: Only applicable to aspeed,ast2500-vuart.

  phandle to aspeed,ast2500-scu compatible syscon alongside register offset

  and bit number to identify how the SIRQ polarity should be configured.

  One possible data source is the LPC/eSPI mode bit.

  Example: aspeed,sirq-polarity-sense = <&syscon 0x70 25>



Note:

* fsl,ns16550:

Documentation/devicetree/bindings/serial/fsl-lpuart.txt

+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ Required properties: 
Optional properties:

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

- dma-names: should contain "tx" and "rx".

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

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

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



Note: Optional properties for DMA support. Write them both or both not.

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

+4 −2
Original line number Diff line number Diff line
@@ -54,8 +54,10 @@ Required properties: 
    - "renesas,hscif-r8a7794" for R8A7794 (R-Car E2) HSCIF compatible UART.

    - "renesas,scif-r8a7795" for R8A7795 (R-Car H3) SCIF compatible UART.

    - "renesas,hscif-r8a7795" for R8A7795 (R-Car H3) HSCIF compatible UART.

    - "renesas,scif-r8a7796" for R8A7796 (R-Car M3-W) SCIF compatible UART.

    - "renesas,hscif-r8a7796" for R8A7796 (R-Car M3-W) HSCIF compatible UART.

    - "renesas,scif-r8a7796" for R8A77960 (R-Car M3-W) SCIF compatible UART.

    - "renesas,hscif-r8a7796" for R8A77960 (R-Car M3-W) HSCIF compatible UART.

    - "renesas,scif-r8a77961" for R8A77961 (R-Car M3-W+) SCIF compatible UART.

    - "renesas,hscif-r8a77961" for R8A77961 (R-Car M3-W+) HSCIF compatible UART.

    - "renesas,scif-r8a77965" for R8A77965 (R-Car M3-N) SCIF compatible UART.

    - "renesas,hscif-r8a77965" for R8A77965 (R-Car M3-N) HSCIF compatible UART.

    - "renesas,scif-r8a77970" for R8A77970 (R-Car V3M) SCIF compatible UART.

CRA Git | Maintained and supported by SUSTech CRA and CCSE