Skip to content

Commit 378ec25

Browse files
committed
Merge tag 'tty-6.16-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 changes for 6.16-rc1. A little more churn than normal in this portion of the kernel for this development cycle, Jiri and Nicholas were busy with cleanups and reviews and fixes for the vt unicode handling logic which composed most of the overall work in here. Major changes are: - vt unicode changes/reverts/changes from Nicholas. This should help out a lot with screen readers and others that rely on vt console support - lock guard additions to the core tty/serial code to clean up lots of error handling logic - 8250 driver updates and fixes - device tree conversions to yaml - sh-sci driver updates - other small cleanups and updates for serial drivers and tty core portions All of these have been in linux-next for 2 weeks with no reported issues" * tag 'tty-6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (105 commits) tty: serial: 8250_omap: fix TX with DMA for am33xx vt: add VT_GETCONSIZECSRPOS to retrieve console size and cursor position vt: bracketed paste support vt: remove VT_RESIZE and VT_RESIZEX from vt_compat_ioctl() vt: process the full-width ASCII fallback range programmatically vt: make use of ucs_get_fallback() when glyph is unavailable vt: add ucs_get_fallback() vt: create ucs_fallback_table.h_shipped with gen_ucs_fallback_table.py vt: introduce gen_ucs_fallback_table.py to create ucs_fallback_table.h vt: move glyph determination to a separate function vt: make sure displayed double-width characters are remembered as such vt: ucs.c: fix misappropriate in_range() usage serial: max3100: Replace open-coded parity calculation with parity8() dt-bindings: serial: 8250_omap: Drop redundant properties dt-bindings: serial: Convert socionext,milbeaut-usio-uart to DT schema dt-bindings: serial: Convert microchip,pic32mzda-uart to DT schema dt-bindings: serial: Convert arm,sbsa-uart to DT schema dt-bindings: serial: Convert snps,arc-uart to DT schema dt-bindings: serial: Convert marvell,armada-3700-uart to DT schema dt-bindings: serial: Convert lantiq,asc to DT schema ...
2 parents c26f4fb + b495021 commit 378ec25

Some content is hidden

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

80 files changed

+6912
-958
lines changed

Documentation/devicetree/bindings/serial/8250.yaml

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,16 @@ properties:
135135
clock-frequency: true
136136

137137
clocks:
138-
maxItems: 1
138+
minItems: 1
139+
items:
140+
- description: The core function clock
141+
- description: An optional bus clock
142+
143+
clock-names:
144+
minItems: 1
145+
items:
146+
- const: core
147+
- const: bus
139148

140149
resets:
141150
maxItems: 1
@@ -224,6 +233,25 @@ required:
224233
- reg
225234
- interrupts
226235

236+
if:
237+
properties:
238+
compatible:
239+
contains:
240+
const: spacemit,k1-uart
241+
then:
242+
required: [clock-names]
243+
properties:
244+
clocks:
245+
minItems: 2
246+
clock-names:
247+
minItems: 2
248+
else:
249+
properties:
250+
clocks:
251+
maxItems: 1
252+
clock-names:
253+
maxItems: 1
254+
227255
unevaluatedProperties: false
228256

229257
examples:

Documentation/devicetree/bindings/serial/8250_omap.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,7 @@ properties:
6464
clock-names:
6565
const: fclk
6666

67-
rts-gpios: true
68-
cts-gpios: true
69-
dtr-gpios: true
70-
dsr-gpios: true
71-
rng-gpios: true
72-
dcd-gpios: true
7367
rs485-rts-active-high: true
74-
rts-gpio: true
7568
power-domains: true
7669
clock-frequency: true
7770
current-speed: true

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ properties:
5656
items:
5757
- enum:
5858
- amlogic,a4-uart
59+
- amlogic,s6-uart
60+
- amlogic,s7-uart
61+
- amlogic,s7d-uart
5962
- amlogic,t7-uart
6063
- const: amlogic,meson-s4-uart
6164

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

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

Documentation/devicetree/bindings/serial/arm,mps2-uart.txt

Lines changed: 0 additions & 19 deletions
This file was deleted.
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+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/serial/arm,mps2-uart.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Arm MPS2 UART
8+
9+
maintainers:
10+
- Vladimir Murzin <[email protected]>
11+
12+
allOf:
13+
- $ref: /schemas/serial/serial.yaml#
14+
15+
properties:
16+
compatible:
17+
const: arm,mps2-uart
18+
19+
reg:
20+
maxItems: 1
21+
22+
interrupts:
23+
items:
24+
- description: RX interrupt
25+
- description: TX interrupt
26+
- description: Overrun interrupt
27+
28+
clocks:
29+
maxItems: 1
30+
31+
required:
32+
- compatible
33+
- reg
34+
- interrupts
35+
- clocks
36+
37+
unevaluatedProperties: false
38+
39+
examples:
40+
- |
41+
serial@40004000 {
42+
compatible = "arm,mps2-uart";
43+
reg = <0x40004000 0x1000>;
44+
interrupts = <0>, <1>, <12>;
45+
clocks = <&sysclk>;
46+
};
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
---
3+
$id: http://devicetree.org/schemas/serial/arm,sbsa-uart.yaml#
4+
$schema: http://devicetree.org/meta-schemas/core.yaml#
5+
6+
title: ARM SBSA UART
7+
8+
maintainers:
9+
- Andre Przywara <[email protected]>
10+
11+
description:
12+
This UART uses a subset of the PL011 registers and consequently lives in the
13+
PL011 driver. It's baudrate and other communication parameters cannot be
14+
adjusted at runtime, so it lacks a clock specifier here.
15+
16+
allOf:
17+
- $ref: /schemas/serial/serial.yaml#
18+
19+
properties:
20+
compatible:
21+
const: arm,sbsa-uart
22+
23+
reg:
24+
maxItems: 1
25+
26+
interrupts:
27+
maxItems: 1
28+
29+
current-speed:
30+
description: fixed baud rate set by the firmware
31+
32+
required:
33+
- compatible
34+
- reg
35+
- interrupts
36+
- current-speed
37+
38+
unevaluatedProperties: false

Documentation/devicetree/bindings/serial/arm_sbsa_uart.txt

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

Documentation/devicetree/bindings/serial/atmel,at91-usart.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ properties:
2626
- enum:
2727
- microchip,sam9x60-usart
2828
- microchip,sam9x7-usart
29+
- microchip,sama7d65-usart
2930
- const: atmel,at91sam9260-usart
3031
- items:
3132
- const: microchip,sam9x60-dbgu

Documentation/devicetree/bindings/serial/cirrus,clps711x-uart.txt

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

0 commit comments

Comments
 (0)