Skip to content

Commit aba9753

Browse files
committed
Merge tag 'tty-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty / serial updates from Greg KH: "Here is a small set of tty and serial driver updates for 6.11-rc1. Not much happened this cycle, unlike the previous kernel release which had lots of "excitement" in this part of the kernel. Included in here are the following changes: - dt binding updates for new platforms - 8250 driver updates - various small serial driver fixes and updates - printk/console naming and matching attempt #2 (was reverted for 6.10-final, should be good to go this time around, acked by the relevant maintainers). All of these have been in linux-next for a while with no reported issues" * tag 'tty-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (22 commits) Documentation: kernel-parameters: Add DEVNAME:0.0 format for serial ports serial: core: Add serial_base_match_and_update_preferred_console() printk: Add match_devname_and_update_preferred_console() serial: sc16is7xx: hardware reset chip if reset-gpios is defined in DT dt-bindings: serial: sc16is7xx: add reset-gpios dt-bindings: serial: vt8500-uart: convert to json-schema serial: 8250_platform: Explicitly show we initialise ISA ports only once tty: add missing MODULE_DESCRIPTION() macros dt-bindings: serial: mediatek,uart: add MT7988 serial: sh-sci: Add support for RZ/V2H(P) SoC dt-bindings: serial: Add documentation for Renesas RZ/V2H(P) (R9A09G057) SCIF support dt-bindings: serial: renesas,scif: Make 'interrupt-names' property as required dt-bindings: serial: renesas,scif: Validate 'interrupts' and 'interrupt-names' dt-bindings: serial: renesas,scif: Move ref for serial.yaml at the end riscv: dts: starfive: jh7110: Add the core reset and jh7110 compatible for uarts serial: 8250_dw: Use reset array API to get resets dt-bindings: serial: snps-dw-apb-uart: Add one more reset signal for StarFive JH7110 SoC serial: 8250: Extract platform driver serial: 8250: Extract RSA bits serial: imx: stop casting struct uart_port to struct imx_port ...
2 parents d7e7895 + 17199df commit aba9753

Some content is hidden

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

41 files changed

+1000
-598
lines changed

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -792,6 +792,25 @@
792792
Documentation/networking/netconsole.rst for an
793793
alternative.
794794

795+
<DEVNAME>:<n>.<n>[,options]
796+
Use the specified serial port on the serial core bus.
797+
The addressing uses DEVNAME of the physical serial port
798+
device, followed by the serial core controller instance,
799+
and the serial port instance. The options are the same
800+
as documented for the ttyS addressing above.
801+
802+
The mapping of the serial ports to the tty instances
803+
can be viewed with:
804+
805+
$ ls -d /sys/bus/serial-base/devices/*:*.*/tty/*
806+
/sys/bus/serial-base/devices/00:04:0.0/tty/ttyS0
807+
808+
In the above example, the console can be addressed with
809+
console=00:04:0.0. Note that a console addressed this
810+
way will only get added when the related device driver
811+
is ready. The use of an earlycon parameter in addition to
812+
the console may be desired for console output early on.
813+
795814
uart[8250],io,<addr>[,options]
796815
uart[8250],mmio,<addr>[,options]
797816
uart[8250],mmio16,<addr>[,options]

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ properties:
3737
- mediatek,mt7623-uart
3838
- mediatek,mt7629-uart
3939
- mediatek,mt7986-uart
40+
- mediatek,mt7988-uart
4041
- mediatek,mt8127-uart
4142
- mediatek,mt8135-uart
4243
- mediatek,mt8173-uart

Documentation/devicetree/bindings/serial/nxp,sc16is7xx.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ properties:
2828
clocks:
2929
maxItems: 1
3030

31+
reset-gpios:
32+
maxItems: 1
33+
3134
clock-frequency:
3235
description:
3336
When there is no clock provider visible to the platform, this
@@ -91,6 +94,7 @@ unevaluatedProperties: false
9194
examples:
9295
- |
9396
#include <dt-bindings/interrupt-controller/irq.h>
97+
#include <dt-bindings/gpio/gpio.h>
9498
i2c {
9599
#address-cells = <1>;
96100
#size-cells = <0>;
@@ -120,6 +124,7 @@ examples:
120124
compatible = "nxp,sc16is752";
121125
reg = <0x54>;
122126
clocks = <&clk20m>;
127+
reset-gpios = <&gpio5 13 GPIO_ACTIVE_LOW>;
123128
interrupt-parent = <&gpio3>;
124129
interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
125130
nxp,modem-control-line-ports = <0 1>; /* Ports 0 and 1 as modem control lines */

Documentation/devicetree/bindings/serial/renesas,scif.yaml

Lines changed: 103 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ title: Renesas Serial Communication Interface with FIFO (SCIF)
99
maintainers:
1010
- Geert Uytterhoeven <[email protected]>
1111

12-
allOf:
13-
- $ref: serial.yaml#
14-
1512
properties:
1613
compatible:
1714
oneOf:
@@ -83,40 +80,39 @@ properties:
8380
- renesas,scif-r9a08g045 # RZ/G3S
8481
- const: renesas,scif-r9a07g044 # RZ/G2{L,LC} fallback
8582

83+
- const: renesas,scif-r9a09g057 # RZ/V2H(P)
84+
8685
reg:
8786
maxItems: 1
8887

8988
interrupts:
9089
oneOf:
9190
- items:
9291
- description: A combined interrupt
93-
- items:
94-
- description: Error interrupt
95-
- description: Receive buffer full interrupt
96-
- description: Transmit buffer empty interrupt
97-
- description: Break interrupt
9892
- items:
9993
- description: Error interrupt
10094
- description: Receive buffer full interrupt
10195
- description: Transmit buffer empty interrupt
10296
- description: Break interrupt
10397
- description: Data Ready interrupt
10498
- description: Transmit End interrupt
99+
- description: Transmit End/Data Ready interrupt
100+
- description: Receive buffer full interrupt (EDGE trigger)
101+
- description: Transmit buffer empty interrupt (EDGE trigger)
102+
minItems: 4
105103

106104
interrupt-names:
107-
oneOf:
108-
- items:
109-
- const: eri
110-
- const: rxi
111-
- const: txi
112-
- const: bri
113-
- items:
114-
- const: eri
115-
- const: rxi
116-
- const: txi
117-
- const: bri
118-
- const: dri
119-
- const: tei
105+
minItems: 4
106+
items:
107+
- const: eri
108+
- const: rxi
109+
- const: txi
110+
- const: bri
111+
- const: dri
112+
- const: tei
113+
- const: tei-dri
114+
- const: rxi-edge
115+
- const: txi-edge
120116

121117
clocks:
122118
minItems: 1
@@ -161,18 +157,92 @@ required:
161157
- clock-names
162158
- power-domains
163159

164-
if:
165-
properties:
166-
compatible:
167-
contains:
168-
enum:
169-
- renesas,rcar-gen2-scif
170-
- renesas,rcar-gen3-scif
171-
- renesas,rcar-gen4-scif
172-
- renesas,scif-r9a07g044
173-
then:
174-
required:
175-
- resets
160+
allOf:
161+
- $ref: serial.yaml#
162+
163+
- if:
164+
properties:
165+
compatible:
166+
contains:
167+
enum:
168+
- renesas,rcar-gen2-scif
169+
- renesas,rcar-gen3-scif
170+
- renesas,rcar-gen4-scif
171+
- renesas,scif-r9a07g044
172+
- renesas,scif-r9a09g057
173+
then:
174+
required:
175+
- resets
176+
177+
- if:
178+
properties:
179+
compatible:
180+
contains:
181+
enum:
182+
- renesas,rcar-gen1-scif
183+
- renesas,rcar-gen2-scif
184+
- renesas,rcar-gen3-scif
185+
- renesas,rcar-gen4-scif
186+
then:
187+
properties:
188+
interrupts:
189+
maxItems: 1
190+
191+
interrupt-names: false
192+
else:
193+
required:
194+
- interrupt-names
195+
196+
- if:
197+
properties:
198+
compatible:
199+
contains:
200+
enum:
201+
- renesas,scif-r7s72100
202+
then:
203+
properties:
204+
interrupts:
205+
minItems: 4
206+
maxItems: 4
207+
208+
interrupt-names:
209+
maxItems: 4
210+
211+
- if:
212+
properties:
213+
compatible:
214+
contains:
215+
enum:
216+
- renesas,scif-r7s9210
217+
- renesas,scif-r9a07g044
218+
then:
219+
properties:
220+
interrupts:
221+
minItems: 6
222+
maxItems: 6
223+
224+
interrupt-names:
225+
minItems: 6
226+
maxItems: 6
227+
228+
- if:
229+
properties:
230+
compatible:
231+
contains:
232+
const: renesas,scif-r9a09g057
233+
then:
234+
properties:
235+
clocks:
236+
maxItems: 1
237+
238+
clock-names:
239+
maxItems: 1
240+
241+
interrupts:
242+
minItems: 9
243+
244+
interrupt-names:
245+
minItems: 9
176246

177247
unevaluatedProperties: false
178248

Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,20 @@ allOf:
1313
- $ref: serial.yaml#
1414
- $ref: rs485.yaml#
1515

16+
- if:
17+
properties:
18+
compatible:
19+
contains:
20+
const: starfive,jh7110-uart
21+
then:
22+
properties:
23+
resets:
24+
minItems: 2
25+
else:
26+
properties:
27+
resets:
28+
maxItems: 1
29+
1630
properties:
1731
compatible:
1832
oneOf:
@@ -48,6 +62,7 @@ properties:
4862
- enum:
4963
- starfive,jh7100-hsuart
5064
- starfive,jh7100-uart
65+
- starfive,jh7110-uart
5166
- const: snps,dw-apb-uart
5267
- const: snps,dw-apb-uart
5368

@@ -82,7 +97,8 @@ properties:
8297
type: boolean
8398

8499
resets:
85-
maxItems: 1
100+
minItems: 1
101+
maxItems: 2
86102

87103
reg-shift: true
88104

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/serial/via,vt8500-uart.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: VIA VT8500 and WonderMedia WM8xxx UART Controller
9+
10+
maintainers:
11+
- Alexey Charkov <[email protected]>
12+
13+
allOf:
14+
- $ref: serial.yaml
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- via,vt8500-uart # up to WM8850/WM8950
20+
- wm,wm8880-uart # for WM8880 and later
21+
22+
clocks:
23+
maxItems: 1
24+
25+
interrupts:
26+
maxItems: 1
27+
28+
reg:
29+
maxItems: 1
30+
31+
required:
32+
- compatible
33+
- clocks
34+
- interrupts
35+
- reg
36+
37+
unevaluatedProperties: false
38+
39+
examples:
40+
- |
41+
serial@d8200000 {
42+
compatible = "via,vt8500-uart";
43+
reg = <0xd8200000 0x1040>;
44+
interrupts = <32>;
45+
clocks = <&clkuart0>;
46+
};

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

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

0 commit comments

Comments
 (0)