Skip to content

Commit ddd0172

Browse files
committed
Merge tag 'tty-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial driver updates from Greg KH: "Here is the big set of serial and tty driver updates for 6.15-rc1. Include in here are the following: - more great tty layer cleanups from Jiri. Someday this will be done, but that's not going to be any year soon... - kdb debug driver reverts to fix a reported issue - lots of .dts binding updates for different devices with serial devices - lots of tiny updates and tweaks and a few bugfixes for different serial drivers. All of these have been in linux-next for a while with no reported issues" * tag 'tty-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (79 commits) tty: serial: fsl_lpuart: Fix unused variable 'sport' build warning serial: stm32: do not deassert RS485 RTS GPIO prematurely serial: 8250: add driver for NI UARTs dt-bindings: serial: snps-dw-apb-uart: document RZ/N1 binding without DMA serial: icom: fix code format problems serial: sh-sci: Save and restore more registers tty: serial: pl011: remove incorrect of_match_ptr annotation dt-bindings: serial: snps-dw-apb-uart: Add support for rk3562 tty: serial: lpuart: only disable CTS instead of overwriting the whole UARTMODIR register tty: caif: removed unused function debugfs_tx() serial: 8250_dma: terminate correct DMA in tx_dma_flush() tty: serial: fsl_lpuart: rename register variables more specifically tty: serial: fsl_lpuart: use port struct directly to simply code tty: serial: fsl_lpuart: Use u32 and u8 for register variables tty: serial: fsl_lpuart: disable transmitter before changing RS485 related registers tty: serial: 8250: Add Brainboxes XC devices dt-bindings: serial: fsl-lpuart: support i.MX94 tty: serial: 8250: Add some more device IDs dt-bindings: serial: samsung: add exynos7870-uart compatible serial: 8250_dw: Comment possible corner cases in serial_out() implementation ...
2 parents 2575798 + 9f8fe34 commit ddd0172

Some content is hidden

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

58 files changed

+2238
-1462
lines changed

Documentation/devicetree/bindings/serial/8250.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ properties:
7777
- altr,16550-FIFO64
7878
- altr,16550-FIFO128
7979
- fsl,16550-FIFO64
80-
- fsl,ns16550
8180
- andestech,uart16550
8281
- nxp,lpc1850-uart
8382
- opencores,uart16550-rtlsvn105
@@ -86,6 +85,7 @@ properties:
8685
- items:
8786
- enum:
8887
- ns16750
88+
- fsl,ns16550
8989
- cavium,octeon-3860-uart
9090
- xlnx,xps-uart16550-2.00.b
9191
- ralink,rt2880-uart

Documentation/devicetree/bindings/serial/fsl-lpuart.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ properties:
3030
- items:
3131
- enum:
3232
- fsl,imx93-lpuart
33+
- fsl,imx94-lpuart
3334
- fsl,imx95-lpuart
3435
- const: fsl,imx8ulp-lpuart
3536
- const: fsl,imx7ulp-lpuart
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/serial/nvidia,tegra264-utc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NVIDIA Tegra UTC (UART Trace Controller) client
8+
9+
maintainers:
10+
- Kartik Rajput <kkartik@nvidia.com>
11+
- Thierry Reding <thierry.reding@gmail.com>
12+
- Jonathan Hunter <jonathanh@nvidia.com>
13+
14+
description:
15+
Represents a client interface of the Tegra UTC (UART Trace Controller). The
16+
Tegra UTC allows multiple clients within the Tegra SoC to share a physical
17+
UART interface. It supports up to 16 clients. Each client operates as an
18+
independent UART endpoint with a dedicated interrupt and 128-character TX/RX
19+
FIFOs.
20+
21+
The Tegra UTC clients use 8-N-1 configuration and operates on a baudrate
22+
configured by the bootloader at the controller level.
23+
24+
allOf:
25+
- $ref: serial.yaml#
26+
27+
properties:
28+
compatible:
29+
const: nvidia,tegra264-utc
30+
31+
reg:
32+
items:
33+
- description: TX region.
34+
- description: RX region.
35+
36+
reg-names:
37+
items:
38+
- const: tx
39+
- const: rx
40+
41+
interrupts:
42+
maxItems: 1
43+
44+
tx-threshold:
45+
minimum: 1
46+
maximum: 128
47+
48+
rx-threshold:
49+
minimum: 1
50+
maximum: 128
51+
52+
required:
53+
- compatible
54+
- reg
55+
- reg-names
56+
- interrupts
57+
- tx-threshold
58+
- rx-threshold
59+
60+
additionalProperties: false
61+
62+
examples:
63+
- |
64+
#include <dt-bindings/interrupt-controller/arm-gic.h>
65+
66+
tegra_utc: serial@c4e0000 {
67+
compatible = "nvidia,tegra264-utc";
68+
reg = <0xc4e0000 0x8000>, <0xc4e8000 0x8000>;
69+
reg-names = "tx", "rx";
70+
interrupts = <GIC_SPI 514 IRQ_TYPE_LEVEL_HIGH>;
71+
tx-threshold = <4>;
72+
rx-threshold = <4>;
73+
};

Documentation/devicetree/bindings/serial/pl011.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@ properties:
9292
3000ms.
9393
default: 3000
9494

95+
power-domains:
96+
maxItems: 1
97+
9598
resets:
9699
maxItems: 1
97100

Documentation/devicetree/bindings/serial/samsung_uart.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ properties:
4242
- samsung,exynosautov9-uart
4343
- samsung,exynosautov920-uart
4444
- const: samsung,exynos850-uart
45+
- items:
46+
- enum:
47+
- samsung,exynos7870-uart
48+
- const: samsung,exynos8895-uart
4549

4650
reg:
4751
maxItems: 1

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

Lines changed: 21 additions & 0 deletions
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+
items:
20+
- enum:
21+
- renesas,r9a06g032-uart
22+
- renesas,r9a06g033-uart
23+
- const: renesas,rzn1-uart
24+
- const: snps,dw-apb-uart
25+
then:
26+
properties:
27+
dmas: false
28+
dma-names: false
29+
1630
- if:
1731
properties:
1832
compatible:
@@ -30,6 +44,12 @@ allOf:
3044
properties:
3145
compatible:
3246
oneOf:
47+
- items:
48+
- enum:
49+
- renesas,r9a06g032-uart
50+
- renesas,r9a06g033-uart
51+
- const: renesas,rzn1-uart
52+
- const: snps,dw-apb-uart
3353
- items:
3454
- enum:
3555
- renesas,r9a06g032-uart
@@ -51,6 +71,7 @@ properties:
5171
- rockchip,rk3368-uart
5272
- rockchip,rk3399-uart
5373
- rockchip,rk3528-uart
74+
- rockchip,rk3562-uart
5475
- rockchip,rk3568-uart
5576
- rockchip,rk3576-uart
5677
- rockchip,rk3588-uart

Documentation/devicetree/bindings/serial/sprd-uart.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,18 @@ properties:
1717
oneOf:
1818
- items:
1919
- enum:
20-
- sprd,sc9632-uart
20+
- sprd,ums9632-uart
21+
- const: sprd,sc9632-uart
22+
- items:
23+
- enum:
2124
- sprd,sc9860-uart
2225
- sprd,sc9863a-uart
2326
- sprd,ums512-uart
2427
- sprd,ums9620-uart
2528
- const: sprd,sc9836-uart
26-
- const: sprd,sc9836-uart
29+
- enum:
30+
- sprd,sc9632-uart
31+
- sprd,sc9836-uart
2732

2833
reg:
2934
maxItems: 1

Documentation/driver-api/serial/driver.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,6 @@ Modem control lines via GPIO
101101
Some helpers are provided in order to set/get modem control lines via GPIO.
102102

103103
.. kernel-doc:: drivers/tty/serial/serial_mctrl_gpio.c
104-
:identifiers: mctrl_gpio_init mctrl_gpio_free mctrl_gpio_to_gpiod
104+
:identifiers: mctrl_gpio_init mctrl_gpio_to_gpiod
105105
mctrl_gpio_set mctrl_gpio_get mctrl_gpio_enable_ms
106-
mctrl_gpio_disable_ms
106+
mctrl_gpio_disable_ms_sync mctrl_gpio_disable_ms_no_sync

Documentation/driver-api/tty/tty_driver.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ freed.
2525
For reference, both allocation and deallocation functions are explained here in
2626
detail:
2727

28+
.. kernel-doc:: include/linux/tty_driver.h
29+
:identifiers: tty_alloc_driver
2830
.. kernel-doc:: drivers/tty/tty_io.c
2931
:identifiers: __tty_alloc_driver tty_driver_kref_put
3032

@@ -35,7 +37,7 @@ Here comes the documentation of flags accepted by tty_alloc_driver() (or
3537
__tty_alloc_driver()):
3638

3739
.. kernel-doc:: include/linux/tty_driver.h
38-
:doc: TTY Driver Flags
40+
:identifiers: tty_driver_flag
3941

4042
----
4143

Documentation/driver-api/tty/tty_struct.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ TTY Struct Flags
7272
================
7373

7474
.. kernel-doc:: include/linux/tty.h
75-
:doc: TTY Struct Flags
75+
:identifiers: tty_struct_flags
7676

7777
TTY Struct Reference
7878
====================

0 commit comments

Comments
 (0)