Skip to content

Commit

Permalink
Merge tag 'tty-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/git/gregkh/tty

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

  A bit more than normal, but nothing major, lots of cleanups.
  Highlights are:

   - lots of tty api cleanups and mxser driver cleanups from Jiri

   - build warning fixes

   - various serial driver updates

   - coding style cleanups

   - various tty driver minor fixes and updates

   - removal of broken and disable r3964 line discipline (finally!)

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

* tag 'tty-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (227 commits)
  serial: mvebu-uart: remove unused member nb from struct mvebu_uart
  arm64: dts: marvell: armada-37xx: Fix reg for standard variant of UART
  dt-bindings: mvebu-uart: fix documentation
  serial: mvebu-uart: correctly calculate minimal possible baudrate
  serial: mvebu-uart: do not allow changing baudrate when uartclk is not available
  serial: mvebu-uart: fix calculation of clock divisor
  tty: make linux/tty_flip.h self-contained
  serial: Prefer unsigned int to bare use of unsigned
  serial: 8250: 8250_omap: Fix possible interrupt storm on K3 SoCs
  serial: qcom_geni_serial: use DT aliases according to DT bindings
  Revert "tty: serial: Add UART driver for Cortina-Access platform"
  tty: serial: Add UART driver for Cortina-Access platform
  MAINTAINERS: add me back as mxser maintainer
  mxser: Documentation, fix typos
  mxser: Documentation, make the docs up-to-date
  mxser: Documentation, remove traces of callout device
  mxser: introduce mxser_16550A_or_MUST helper
  mxser: rename flags to old_speed in mxser_set_serial_info
  mxser: use port variable in mxser_set_serial_info
  mxser: access info->MCR under info->slock
  ...
  • Loading branch information
torvalds committed Jul 5, 2021
2 parents a16d864 + 15279eb commit c932ed0
Show file tree
Hide file tree
Showing 162 changed files with 2,104 additions and 5,140 deletions.
5 changes: 5 additions & 0 deletions Documentation/admin-guide/kernel-parameters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1122,6 +1122,11 @@
the driver will use only 32-bit accessors to read/write
the device registers.

liteuart,<addr>
Start an early console on a litex serial port at the
specified address. The serial port must already be
setup and configured. Options are not yet supported.

meson,<addr>
Start an early, polled-mode console on a meson serial
port at the specified address. The serial port must
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/serial/8250.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ maintainers:
- [email protected]

allOf:
- $ref: /schemas/serial.yaml#
- $ref: serial.yaml#
- if:
anyOf:
- required:
Expand Down
118 changes: 118 additions & 0 deletions Documentation/devicetree/bindings/serial/8250_omap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/serial/8250_omap.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Bindings for 8250 compliant UARTs on TI's OMAP2+ and K3 SoCs

maintainers:
- Vignesh Raghavendra <[email protected]>

allOf:
- $ref: /schemas/serial/serial.yaml#
- $ref: /schemas/serial/rs485.yaml#

properties:
compatible:
oneOf:
- enum:
- ti,am3352-uart
- ti,am4372-uart
- ti,am654-uart
- ti,dra742-uart
- ti,omap2-uart
- ti,omap3-uart
- ti,omap4-uart
- items:
- enum:
- ti,am64-uart
- ti,j721e-uart
- const: ti,am654-uart

ti,hwmods:
description:
Must be "uart<n>", n being the instance number (1-based)
This property is applicable only on legacy platforms mainly omap2/3
and ti81xx and should not be used on other platforms.
$ref: /schemas/types.yaml#/definitions/string
deprecated: true

dmas:
minItems: 1
maxItems: 2

dma-names:
items:
- const: tx
- const: rx

reg:
maxItems: 1

interrupts:
minItems: 1
maxItems: 2
description:
First entry is module IRQ required for normal IO operation.
Second entry is optional and corresponds to system wakeup IRQ
where supported.

clocks:
maxItems: 1

clock-names:
const: fclk

rts-gpios: true
cts-gpios: true
dtr-gpios: true
dsr-gpios: true
rng-gpios: true
dcd-gpios: true
rs485-rts-delay: true
rs485-rts-active-low: true
rs485-rx-during-tx: true
rs485-rts-active-high: true
linux,rs485-enabled-at-boot-time: true
rts-gpio: true
power-domains: true
clock-frequency: true
current-speed: true

required:
- compatible
- reg
- interrupts

additionalProperties: false

if:
properties:
compatible:
oneOf:
- const: ti,omap2-uart
- const: ti,omap3-uart
- const: ti,omap4-uart

then:
properties:
ti,hwmods:
items:
- pattern: "^uart([1-9])$"

else:
properties:
ti,hwmods: false

examples:
- |
serial@49042000 {
compatible = "ti,omap3-uart";
reg = <0x49042000 0x400>;
interrupts = <80>;
dmas = <&sdma 81 &sdma 82>;
dma-names = "tx", "rx";
ti,hwmods = "uart4";
clock-frequency = <48000000>;
};
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ properties:
- const: pclk
- const: baud

fifo-size:
description: The fifo size supported by the UART channel.
$ref: /schemas/types.yaml#/definitions/uint32
enum: [64, 128]

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ maintainers:
- Al Cooper <[email protected]>

allOf:
- $ref: /schemas/serial.yaml#
- $ref: serial.yaml#

description: |+
The Broadcom UART is based on the basic 8250 UART but with
Expand Down
12 changes: 12 additions & 0 deletions Documentation/devicetree/bindings/serial/fsl-imx-uart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,18 @@ properties:
received, and that the peripheral should invert its input using the
INVR registers.
fsl,dma-info:
$ref: /schemas/types.yaml#/definitions/uint32-array
minItems: 2
maxItems: 2
description: |
First cell contains the size of DMA buffer chunks, second cell contains
the amount of chunks used for the device. Multiplying both numbers is
the total size of memory used for receiving data.
When not being configured the system will use default settings, which
are sensible for most use cases. If you need low latency processing on
slow connections this needs to be configured appropriately.
uart-has-rtscts: true

rs485-rts-delay: true
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/serial/ingenic,uart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ maintainers:
- Paul Cercueil <[email protected]>

allOf:
- $ref: /schemas/serial.yaml#
- $ref: serial.yaml#

properties:
$nodename:
Expand Down
6 changes: 3 additions & 3 deletions Documentation/devicetree/bindings/serial/mvebu-uart.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Required properties:
- compatible:
- "marvell,armada-3700-uart" for the standard variant of the UART
(32 bytes FIFO, no DMA, level interrupts, 8-bit access to the
FIFO, baudrate limited to 230400).
FIFO), called also UART1.
- "marvell,armada-3700-uart-ext" for the extended variant of the
UART (128 bytes FIFO, DMA, front interrupts, 8-bit or 32-bit
accesses to the FIFO, baudrate unlimited by the dividers).
accesses to the FIFO), called also UART2.
- reg: offset and length of the register set for the device.
- clocks: UART reference clock used to derive the baudrate. If no clock
is provided (possible only with the "marvell,armada-3700-uart"
Expand All @@ -33,7 +33,7 @@ Required properties:
Example:
uart0: serial@12000 {
compatible = "marvell,armada-3700-uart";
reg = <0x12000 0x200>;
reg = <0x12000 0x18>;
clocks = <&xtalclk>;
interrupts =
<GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
Expand Down
40 changes: 0 additions & 40 deletions Documentation/devicetree/bindings/serial/omap_serial.txt

This file was deleted.

13 changes: 5 additions & 8 deletions Documentation/devicetree/bindings/serial/pl011.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ maintainers:
- Rob Herring <[email protected]>

allOf:
- $ref: /schemas/serial.yaml#
- $ref: serial.yaml#

# Need a custom select here or 'arm,primecell' will match on lots of nodes
select:
Expand All @@ -24,12 +24,9 @@ select:

properties:
compatible:
oneOf:
- items:
- const: arm,pl011
- const: arm,primecell
- items:
- const: arm,primecell
items:
- const: arm,pl011
- const: arm,primecell

reg:
maxItems: 1
Expand Down Expand Up @@ -103,7 +100,7 @@ dependencies:
poll-rate-ms: [ auto-poll ]
poll-timeout-ms: [ auto-poll ]

additionalProperties: false
unevaluatedProperties: false

examples:
- |
Expand Down
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/serial/qca,ar9330-uart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ maintainers:
- Oleksij Rempel <[email protected]>

allOf:
- $ref: /schemas/serial.yaml#
- $ref: serial.yaml#

properties:
compatible:
Expand All @@ -35,7 +35,7 @@ required:
- clocks
- clock-names

additionalProperties: false
unevaluatedProperties: false

examples:
- |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ required:
- clocks
- clock-names

additionalProperties: false
unevaluatedProperties: false

examples:
- |
Expand Down
4 changes: 4 additions & 0 deletions Documentation/devicetree/bindings/serial/renesas,scif.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ properties:
- const: renesas,rcar-gen3-scif # R-Car Gen3 and RZ/G2
- const: renesas,scif # generic SCIF compatible UART

- items:
- enum:
- renesas,scif-r9a07g044 # RZ/G2{L,LC}

reg:
maxItems: 1

Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/serial/samsung_uart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ required:
unevaluatedProperties: false

allOf:
- $ref: /schemas/serial.yaml#
- $ref: serial.yaml#

- if:
properties:
Expand Down
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/serial/serial.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ properties:
$nodename:
pattern: "^serial(@.*)?$"

label: true

cts-gpios:
maxItems: 1
description:
Expand Down
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/serial/sifive-serial.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ maintainers:
- Palmer Dabbelt <[email protected]>

allOf:
- $ref: /schemas/serial.yaml#
- $ref: serial.yaml#

properties:
compatible:
Expand Down Expand Up @@ -49,7 +49,7 @@ required:
- interrupts
- clocks

additionalProperties: false
unevaluatedProperties: false

examples:
- |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ maintainers:
- Rob Herring <[email protected]>

allOf:
- $ref: /schemas/serial.yaml#
- $ref: serial.yaml#

properties:
compatible:
Expand All @@ -23,6 +23,7 @@ properties:
- items:
- enum:
- rockchip,px30-uart
- rockchip,rk1808-uart
- rockchip,rk3036-uart
- rockchip,rk3066-uart
- rockchip,rk3188-uart
Expand All @@ -31,6 +32,7 @@ properties:
- rockchip,rk3328-uart
- rockchip,rk3368-uart
- rockchip,rk3399-uart
- rockchip,rk3568-uart
- rockchip,rv1108-uart
- const: snps,dw-apb-uart
- items:
Expand Down
3 changes: 1 addition & 2 deletions Documentation/devicetree/bindings/serial/st,stm32-uart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,7 @@ required:
- interrupts
- clocks

additionalProperties:
type: object
unevaluatedProperties: false

examples:
- |
Expand Down
Loading

0 comments on commit c932ed0

Please sign in to comment.