Skip to content

Commit c932ed0

Browse files
committed
Merge tag 'tty-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/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 ...
2 parents a16d864 + 15279eb commit c932ed0

162 files changed

Lines changed: 2104 additions & 5140 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,6 +1122,11 @@
11221122
the driver will use only 32-bit accessors to read/write
11231123
the device registers.
11241124

1125+
liteuart,<addr>
1126+
Start an early console on a litex serial port at the
1127+
specified address. The serial port must already be
1128+
setup and configured. Options are not yet supported.
1129+
11251130
meson,<addr>
11261131
Start an early, polled-mode console on a meson serial
11271132
port at the specified address. The serial port must

Documentation/devicetree/bindings/serial/8250.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ maintainers:
1010
- devicetree@vger.kernel.org
1111

1212
allOf:
13-
- $ref: /schemas/serial.yaml#
13+
- $ref: serial.yaml#
1414
- if:
1515
anyOf:
1616
- required:
Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/serial/8250_omap.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Bindings for 8250 compliant UARTs on TI's OMAP2+ and K3 SoCs
8+
9+
maintainers:
10+
- Vignesh Raghavendra <vigneshr@ti.com>
11+
12+
allOf:
13+
- $ref: /schemas/serial/serial.yaml#
14+
- $ref: /schemas/serial/rs485.yaml#
15+
16+
properties:
17+
compatible:
18+
oneOf:
19+
- enum:
20+
- ti,am3352-uart
21+
- ti,am4372-uart
22+
- ti,am654-uart
23+
- ti,dra742-uart
24+
- ti,omap2-uart
25+
- ti,omap3-uart
26+
- ti,omap4-uart
27+
- items:
28+
- enum:
29+
- ti,am64-uart
30+
- ti,j721e-uart
31+
- const: ti,am654-uart
32+
33+
ti,hwmods:
34+
description:
35+
Must be "uart<n>", n being the instance number (1-based)
36+
This property is applicable only on legacy platforms mainly omap2/3
37+
and ti81xx and should not be used on other platforms.
38+
$ref: /schemas/types.yaml#/definitions/string
39+
deprecated: true
40+
41+
dmas:
42+
minItems: 1
43+
maxItems: 2
44+
45+
dma-names:
46+
items:
47+
- const: tx
48+
- const: rx
49+
50+
reg:
51+
maxItems: 1
52+
53+
interrupts:
54+
minItems: 1
55+
maxItems: 2
56+
description:
57+
First entry is module IRQ required for normal IO operation.
58+
Second entry is optional and corresponds to system wakeup IRQ
59+
where supported.
60+
61+
clocks:
62+
maxItems: 1
63+
64+
clock-names:
65+
const: fclk
66+
67+
rts-gpios: true
68+
cts-gpios: true
69+
dtr-gpios: true
70+
dsr-gpios: true
71+
rng-gpios: true
72+
dcd-gpios: true
73+
rs485-rts-delay: true
74+
rs485-rts-active-low: true
75+
rs485-rx-during-tx: true
76+
rs485-rts-active-high: true
77+
linux,rs485-enabled-at-boot-time: true
78+
rts-gpio: true
79+
power-domains: true
80+
clock-frequency: true
81+
current-speed: true
82+
83+
required:
84+
- compatible
85+
- reg
86+
- interrupts
87+
88+
additionalProperties: false
89+
90+
if:
91+
properties:
92+
compatible:
93+
oneOf:
94+
- const: ti,omap2-uart
95+
- const: ti,omap3-uart
96+
- const: ti,omap4-uart
97+
98+
then:
99+
properties:
100+
ti,hwmods:
101+
items:
102+
- pattern: "^uart([1-9])$"
103+
104+
else:
105+
properties:
106+
ti,hwmods: false
107+
108+
examples:
109+
- |
110+
serial@49042000 {
111+
compatible = "ti,omap3-uart";
112+
reg = <0x49042000 0x400>;
113+
interrupts = <80>;
114+
dmas = <&sdma 81 &sdma 82>;
115+
dma-names = "tx", "rx";
116+
ti,hwmods = "uart4";
117+
clock-frequency = <48000000>;
118+
};

Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ properties:
5555
- const: pclk
5656
- const: baud
5757

58+
fifo-size:
59+
description: The fifo size supported by the UART channel.
60+
$ref: /schemas/types.yaml#/definitions/uint32
61+
enum: [64, 128]
62+
5863
required:
5964
- compatible
6065
- reg

Documentation/devicetree/bindings/serial/brcm,bcm7271-uart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ maintainers:
1010
- Al Cooper <alcooperx@gmail.com>
1111

1212
allOf:
13-
- $ref: /schemas/serial.yaml#
13+
- $ref: serial.yaml#
1414

1515
description: |+
1616
The Broadcom UART is based on the basic 8250 UART but with

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,18 @@ properties:
7171
received, and that the peripheral should invert its input using the
7272
INVR registers.
7373
74+
fsl,dma-info:
75+
$ref: /schemas/types.yaml#/definitions/uint32-array
76+
minItems: 2
77+
maxItems: 2
78+
description: |
79+
First cell contains the size of DMA buffer chunks, second cell contains
80+
the amount of chunks used for the device. Multiplying both numbers is
81+
the total size of memory used for receiving data.
82+
When not being configured the system will use default settings, which
83+
are sensible for most use cases. If you need low latency processing on
84+
slow connections this needs to be configured appropriately.
85+
7486
uart-has-rtscts: true
7587

7688
rs485-rts-delay: true

Documentation/devicetree/bindings/serial/ingenic,uart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ maintainers:
1010
- Paul Cercueil <paul@crapouillou.net>
1111

1212
allOf:
13-
- $ref: /schemas/serial.yaml#
13+
- $ref: serial.yaml#
1414

1515
properties:
1616
$nodename:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Required properties:
55
- compatible:
66
- "marvell,armada-3700-uart" for the standard variant of the UART
77
(32 bytes FIFO, no DMA, level interrupts, 8-bit access to the
8-
FIFO, baudrate limited to 230400).
8+
FIFO), called also UART1.
99
- "marvell,armada-3700-uart-ext" for the extended variant of the
1010
UART (128 bytes FIFO, DMA, front interrupts, 8-bit or 32-bit
11-
accesses to the FIFO, baudrate unlimited by the dividers).
11+
accesses to the FIFO), called also UART2.
1212
- reg: offset and length of the register set for the device.
1313
- clocks: UART reference clock used to derive the baudrate. If no clock
1414
is provided (possible only with the "marvell,armada-3700-uart"
@@ -33,7 +33,7 @@ Required properties:
3333
Example:
3434
uart0: serial@12000 {
3535
compatible = "marvell,armada-3700-uart";
36-
reg = <0x12000 0x200>;
36+
reg = <0x12000 0x18>;
3737
clocks = <&xtalclk>;
3838
interrupts =
3939
<GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,

Documentation/devicetree/bindings/serial/omap_serial.txt

Lines changed: 0 additions & 40 deletions
This file was deleted.

Documentation/devicetree/bindings/serial/pl011.yaml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ maintainers:
1010
- Rob Herring <robh@kernel.org>
1111

1212
allOf:
13-
- $ref: /schemas/serial.yaml#
13+
- $ref: serial.yaml#
1414

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

2525
properties:
2626
compatible:
27-
oneOf:
28-
- items:
29-
- const: arm,pl011
30-
- const: arm,primecell
31-
- items:
32-
- const: arm,primecell
27+
items:
28+
- const: arm,pl011
29+
- const: arm,primecell
3330

3431
reg:
3532
maxItems: 1
@@ -103,7 +100,7 @@ dependencies:
103100
poll-rate-ms: [ auto-poll ]
104101
poll-timeout-ms: [ auto-poll ]
105102

106-
additionalProperties: false
103+
unevaluatedProperties: false
107104

108105
examples:
109106
- |

0 commit comments

Comments
 (0)