Skip to content

Commit 1f24458

Browse files
committed
Merge tag 'tty-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty and serial updates from Greg KH: "Here is the big set of tty/serial driver changes for 6.7-rc1. Included in here are: - console/vgacon cleanups and removals from Arnd - tty core and n_tty cleanups from Jiri - lots of 8250 driver updates and cleanups - sc16is7xx serial driver updates - dt binding updates - first set of port lock wrapers from Thomas for the printk fixes coming in future releases - other small serial and tty core cleanups and updates All of these have been in linux-next for a while with no reported issues" * tag 'tty-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (193 commits) serdev: Replace custom code with device_match_acpi_handle() serdev: Simplify devm_serdev_device_open() function serdev: Make use of device_set_node() tty: n_gsm: add copyright Siemens Mobility GmbH tty: n_gsm: fix race condition in status line change on dead connections serial: core: Fix runtime PM handling for pending tx vgacon: fix mips/sibyte build regression dt-bindings: serial: drop unsupported samsung bindings tty: serial: samsung: drop earlycon support for unsupported platforms tty: 8250: Add note for PX-835 tty: 8250: Fix IS-200 PCI ID comment tty: 8250: Add Brainboxes Oxford Semiconductor-based quirks tty: 8250: Add support for Intashield IX cards tty: 8250: Add support for additional Brainboxes PX cards tty: 8250: Fix up PX-803/PX-857 tty: 8250: Fix port count of PX-257 tty: 8250: Add support for Intashield IS-100 tty: 8250: Add support for Brainboxes UP cards tty: 8250: Add support for additional Brainboxes UC cards tty: 8250: Remove UC-257 and UC-431 ...
2 parents 4c7a0c9 + 64ebf87 commit 1f24458

File tree

172 files changed

+4055
-2326
lines changed

Some content is hidden

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

172 files changed

+4055
-2326
lines changed

Documentation/ABI/testing/sysfs-tty

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,22 @@ What: /sys/class/tty/ttyS<x>/close_delay
8787
Date: October 2012
8888
Contact: Alan Cox <[email protected]>
8989
Description:
90-
Show the closing delay time for this port in ms.
90+
Show the closing delay time for this port in centiseconds.
9191

92-
These sysfs values expose the TIOCGSERIAL interface via
93-
sysfs rather than via ioctls.
92+
These sysfs values expose the TIOCGSERIAL interface via
93+
sysfs rather than via ioctls.
9494

9595
What: /sys/class/tty/ttyS<x>/closing_wait
9696
Date: October 2012
9797
Contact: Alan Cox <[email protected]>
9898
Description:
99-
Show the close wait time for this port in ms.
99+
Show the close wait time for this port in centiseconds.
100100

101-
These sysfs values expose the TIOCGSERIAL interface via
102-
sysfs rather than via ioctls.
101+
Waiting forever is represented as 0. If waiting on close is
102+
disabled then the value is 65535.
103+
104+
These sysfs values expose the TIOCGSERIAL interface via
105+
sysfs rather than via ioctls.
103106

104107
What: /sys/class/tty/ttyS<x>/custom_divisor
105108
Date: October 2012
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
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/esp,esp32-acm.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: ESP32S3 ACM gadget controller
9+
10+
maintainers:
11+
- Max Filippov <[email protected]>
12+
13+
description:
14+
Fixed function USB CDC-ACM gadget controller of the Espressif ESP32S3 SoC.
15+
16+
allOf:
17+
- $ref: serial.yaml#
18+
19+
properties:
20+
compatible:
21+
const: esp,esp32s3-acm
22+
23+
reg:
24+
maxItems: 1
25+
26+
interrupts:
27+
maxItems: 1
28+
29+
required:
30+
- compatible
31+
- reg
32+
- interrupts
33+
34+
additionalProperties: false
35+
36+
examples:
37+
- |
38+
serial@60038000 {
39+
compatible = "esp,esp32s3-acm";
40+
reg = <0x60038000 0x1000>;
41+
interrupts = <96 3 0>;
42+
};
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
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/esp,esp32-uart.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: ESP32xx UART controllers
9+
10+
maintainers:
11+
- Max Filippov <[email protected]>
12+
13+
description:
14+
ESP32 UART controller is a part of the ESP32 SoC.
15+
ESP32S3 UART controller is a part of the ESP32S3 SoC.
16+
Both SoCs are produced by Espressif Systems Co. Ltd.
17+
18+
allOf:
19+
- $ref: serial.yaml#
20+
21+
properties:
22+
compatible:
23+
enum:
24+
- esp,esp32-uart
25+
- esp,esp32s3-uart
26+
27+
reg:
28+
maxItems: 1
29+
30+
interrupts:
31+
maxItems: 1
32+
33+
clocks:
34+
maxItems: 1
35+
36+
required:
37+
- compatible
38+
- reg
39+
- interrupts
40+
- clocks
41+
42+
additionalProperties: false
43+
44+
examples:
45+
- |
46+
serial@60000000 {
47+
compatible = "esp,esp32s3-uart";
48+
reg = <0x60000000 0x80>;
49+
interrupts = <27 1 0>;
50+
clocks = <&serial_clk>;
51+
};

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ properties:
7070
interrupts:
7171
maxItems: 1
7272

73+
wakeup-source: true
74+
7375
fsl,dte-mode:
7476
$ref: /schemas/types.yaml#/definitions/flag
7577
description: |

Documentation/devicetree/bindings/serial/fsl-mxs-auart.yaml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,13 @@ allOf:
1414

1515
properties:
1616
compatible:
17-
enum:
18-
- fsl,imx23-auart
19-
- fsl,imx28-auart
20-
- alphascale,asm9260-auart
17+
oneOf:
18+
- const: fsl,imx23-auart
19+
- const: alphascale,asm9260-auart
20+
- items:
21+
- enum:
22+
- fsl,imx28-auart
23+
- const: fsl,imx23-auart
2124

2225
reg:
2326
maxItems: 1
@@ -82,7 +85,7 @@ examples:
8285
};
8386
8487
auart0: serial@8006a000 {
85-
compatible = "fsl,imx28-auart";
88+
compatible = "fsl,imx28-auart", "fsl,imx23-auart";
8689
reg = <0x8006a000 0x2000>;
8790
interrupts = <112>;
8891
dmas = <&dma_apbx 8>, <&dma_apbx 9>;

Documentation/devicetree/bindings/serial/maxim,max310x.txt

Lines changed: 0 additions & 48 deletions
This file was deleted.
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/serial/maxim,max310x.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Maxim MAX310X Advanced Universal Asynchronous Receiver-Transmitter (UART)
8+
9+
maintainers:
10+
- Hugo Villeneuve <[email protected]>
11+
12+
properties:
13+
compatible:
14+
enum:
15+
- maxim,max3107
16+
- maxim,max3108
17+
- maxim,max3109
18+
- maxim,max14830
19+
20+
reg:
21+
maxItems: 1
22+
23+
interrupts:
24+
maxItems: 1
25+
26+
clocks:
27+
maxItems: 1
28+
29+
clock-names:
30+
enum:
31+
- xtal # External crystal
32+
- osc # External clock source
33+
34+
gpio-controller: true
35+
36+
"#gpio-cells":
37+
const: 2
38+
39+
gpio-line-names:
40+
minItems: 1
41+
maxItems: 16
42+
43+
required:
44+
- compatible
45+
- reg
46+
- interrupts
47+
- clocks
48+
- clock-names
49+
50+
allOf:
51+
- $ref: /schemas/spi/spi-peripheral-props.yaml#
52+
- $ref: /schemas/serial/serial.yaml#
53+
- $ref: /schemas/serial/rs485.yaml#
54+
55+
unevaluatedProperties: false
56+
57+
examples:
58+
- |
59+
#include <dt-bindings/interrupt-controller/irq.h>
60+
i2c {
61+
#address-cells = <1>;
62+
#size-cells = <0>;
63+
64+
serial@2c {
65+
compatible = "maxim,max3107";
66+
reg = <0x2c>;
67+
clocks = <&xtal4m>;
68+
clock-names = "xtal";
69+
interrupt-parent = <&gpio3>;
70+
interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
71+
gpio-controller;
72+
#gpio-cells = <2>;
73+
};
74+
};

Documentation/devicetree/bindings/serial/nvidia,tegra20-hsuart.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,6 @@ properties:
9191
- description: range upper bound
9292
- description: adjustment (in permyriad, i.e. 0.01%)
9393

94-
allOf:
95-
- $ref: serial.yaml
96-
97-
unevaluatedProperties: false
98-
9994
required:
10095
- compatible
10196
- reg
@@ -106,6 +101,11 @@ required:
106101
- dmas
107102
- dma-names
108103

104+
allOf:
105+
- $ref: serial.yaml
106+
107+
unevaluatedProperties: false
108+
109109
examples:
110110
- |
111111
#include <dt-bindings/clock/tegra30-car.h>

0 commit comments

Comments
 (0)