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

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

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

  Lots of serial driver updates in here, some small vt cleanups, and a
  raft of SPDX and license boilerplate cleanups, messing up the diffstat
  a bit.

  Nothing major, with no realy functional changes except better hardware
  support for some platforms.

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

* tag 'tty-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (110 commits)
  tty: ehv_bytechan: fix spelling mistake
  tty: serial: meson: allow baud-rates lower than 9600
  serial: 8250_fintek: Fix crash with baud rate B0
  serial: 8250_fintek: Disable delays for ports != 0
  serial: 8250_fintek: Return -EINVAL on invalid configuration
  tty: Remove redundant license text
  tty: serdev: Remove redundant license text
  tty: hvc: Remove redundant license text
  tty: serial: Remove redundant license text
  tty: add SPDX identifiers to all remaining files in drivers/tty/
  tty: serial: jsm: remove redundant pointer ts
  tty: serial: jsm: add space before the open parenthesis '('
  tty: serial: jsm: fix coding style
  tty: serial: jsm: delete space between function name and '('
  tty: serial: jsm: add blank line after declarations
  tty: serial: jsm: change the type of local variable
  tty: serial: imx: remove dead code imx_dma_rxint
  tty: serial: imx: disable ageing timer interrupt if dma in use
  serial: 8250: fix potential deadlock in rs485-mode
  serial: m32r_sio: Drop redundant .data assignment
  ...
parents 449fcf3a 57f5d648

Documentation/devicetree/bindings/dma/stm32-dma.txt

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ channel: a phandle to the DMA controller plus the following four integer cells: 
Example:



	usart1: serial@40011000 {

		compatible = "st,stm32-usart", "st,stm32-uart";

		compatible = "st,stm32-uart";

		reg = <0x40011000 0x400>;

		interrupts = <37>;

		clocks = <&clk_pclk2>;

Documentation/devicetree/bindings/serial/atmel-usart.txt

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ Optional properties: 
	- dma-names: "rx" for RX channel, "tx" for TX channel.

- atmel,fifo-size: maximum number of data the RX and TX FIFOs can store for FIFO

  capable USARTs.

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



<chip> compatible description:

- at91rm9200:  legacy USART support

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

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Optional properties: 
- fsl,irda-mode : Indicate the uart supports irda mode

- fsl,dte-mode : Indicate the uart works in DTE mode. The uart works

                  in DCE mode by default.

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



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

for the complete list of generic properties.

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

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,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-rx-during-tx, 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/omap_serial.txt

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ Optional properties: 
- dmas : DMA specifier, consisting of a phandle to the DMA controller

         node and a DMA channel number.

- 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



Example: