Skip to content

Commit 342465f

Browse files
committed
Merge tag 'tty-5.17-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 tty/serial driver updates for 5.17-rc1. Nothing major in here, just lots of good updates and fixes, including: - more tty core cleanups from Jiri as well as mxser driver cleanups. This is the majority of the core diffstat - tty documentation updates from Jiri - platform_get_irq() updates - various serial driver updates for new features and hardware - fifo usage for 8250 console, reducing cpu load a lot - LED fix for keyboards, long-time bugfix that went through many revisions - minor cleanups All have been in linux-next for a while with no reported problems" * tag 'tty-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (119 commits) serial: core: Keep mctrl register state and cached copy in sync serial: stm32: correct loop for dma error handling serial: stm32: fix flow control transfer in DMA mode serial: stm32: rework TX DMA state condition serial: stm32: move tx dma terminate DMA to shutdown serial: pl011: Drop redundant DTR/RTS preservation on close/open serial: pl011: Drop CR register reset on set_termios serial: pl010: Drop CR register reset on set_termios serial: liteuart: fix MODULE_ALIAS serial: 8250_bcm7271: Fix return error code in case of dma_alloc_coherent() failure Revert "serdev: BREAK/FRAME/PARITY/OVERRUN notification prototype V2" tty: goldfish: Use platform_get_irq() to get the interrupt serdev: BREAK/FRAME/PARITY/OVERRUN notification prototype V2 tty: serial: meson: Drop the legacy compatible strings and clock code serial: pmac_zilog: Use platform_get_irq() to get the interrupt serial: bcm63xx: Use platform_get_irq() to get the interrupt serial: ar933x: Use platform_get_irq() to get the interrupt serial: vt8500: Use platform_get_irq() to get the interrupt serial: altera_jtaguart: Use platform_get_irq_optional() to get the interrupt serial: pxa: Use platform_get_irq() to get the interrupt ...
2 parents 22ef121 + 93a770b commit 342465f

Some content is hidden

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

86 files changed

+3294
-2980
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,15 @@ properties:
2929
- amlogic,meson8-uart
3030
- amlogic,meson8b-uart
3131
- amlogic,meson-gx-uart
32+
- amlogic,meson-s4-uart
3233
- const: amlogic,meson-ao-uart
3334
- description: Everything-Else power domain UART controller
3435
enum:
3536
- amlogic,meson6-uart
3637
- amlogic,meson8-uart
3738
- amlogic,meson8b-uart
3839
- amlogic,meson-gx-uart
40+
- amlogic,meson-s4-uart
3941

4042
reg:
4143
maxItems: 1

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,15 @@ properties:
2121
- fsl,ls1028a-lpuart
2222
- fsl,imx7ulp-lpuart
2323
- fsl,imx8qm-lpuart
24+
- fsl,imxrt1050-lpuart
2425
- items:
25-
- const: fsl,imx8qxp-lpuart
26+
- enum:
27+
- fsl,imx8qxp-lpuart
28+
- fsl,imx8ulp-lpuart
2629
- const: fsl,imx7ulp-lpuart
30+
- items:
31+
- const: fsl,imx8qm-lpuart
32+
- const: fsl,imx8qxp-lpuart
2733

2834
reg:
2935
maxItems: 1

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

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,15 @@ allOf:
1414

1515
properties:
1616
compatible:
17-
const: renesas,sci
17+
oneOf:
18+
- items:
19+
- enum:
20+
- renesas,r9a07g044-sci # RZ/G2{L,LC}
21+
- renesas,r9a07g054-sci # RZ/V2L
22+
- const: renesas,sci # generic SCI compatible UART
23+
24+
- items:
25+
- const: renesas,sci # generic SCI compatible UART
1826

1927
reg:
2028
maxItems: 1
@@ -54,18 +62,46 @@ required:
5462
- clocks
5563
- clock-names
5664

65+
if:
66+
properties:
67+
compatible:
68+
contains:
69+
enum:
70+
- renesas,r9a07g044-sci
71+
- renesas,r9a07g054-sci
72+
then:
73+
properties:
74+
resets:
75+
maxItems: 1
76+
77+
power-domains:
78+
maxItems: 1
79+
80+
required:
81+
- resets
82+
- power-domains
83+
5784
unevaluatedProperties: false
5885

5986
examples:
6087
- |
88+
#include <dt-bindings/clock/r9a07g044-cpg.h>
89+
#include <dt-bindings/interrupt-controller/arm-gic.h>
90+
6191
aliases {
6292
serial0 = &sci0;
6393
};
6494
65-
sci0: serial@ffff78 {
66-
compatible = "renesas,sci";
67-
reg = <0xffff78 8>;
68-
interrupts = <88 0>, <89 0>, <90 0>, <91 0>;
69-
clocks = <&fclk>;
95+
sci0: serial@1004d000 {
96+
compatible = "renesas,r9a07g044-sci", "renesas,sci";
97+
reg = <0x1004d000 0x400>;
98+
interrupts = <GIC_SPI 405 IRQ_TYPE_LEVEL_HIGH>,
99+
<GIC_SPI 406 IRQ_TYPE_LEVEL_HIGH>,
100+
<GIC_SPI 407 IRQ_TYPE_LEVEL_HIGH>,
101+
<GIC_SPI 408 IRQ_TYPE_LEVEL_HIGH>;
102+
interrupt-names = "eri", "rxi", "txi", "tei";
103+
clocks = <&cpg CPG_MOD R9A07G044_SCI0_CLKP>;
70104
clock-names = "fck";
105+
power-domains = <&cpg>;
106+
resets = <&cpg R9A07G044_SCI0_RST>;
71107
};

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,21 @@ properties:
6464
- const: renesas,rcar-gen3-scif # R-Car Gen3 and RZ/G2
6565
- const: renesas,scif # generic SCIF compatible UART
6666

67+
- items:
68+
- enum:
69+
- renesas,scif-r8a779f0 # R-Car S4-8
70+
- const: renesas,rcar-gen4-scif # R-Car Gen4
71+
- const: renesas,scif # generic SCIF compatible UART
72+
6773
- items:
6874
- enum:
6975
- renesas,scif-r9a07g044 # RZ/G2{L,LC}
76+
- renesas,scif-r9a07g054 # RZ/V2L
77+
78+
- items:
79+
- enum:
80+
- renesas,scif-r9a07g054 # RZ/V2L
81+
- const: renesas,scif-r9a07g044 # RZ/G2{L,LC} fallback for RZ/V2L
7082

7183
reg:
7284
maxItems: 1
@@ -153,6 +165,9 @@ if:
153165
enum:
154166
- renesas,rcar-gen2-scif
155167
- renesas,rcar-gen3-scif
168+
- renesas,rcar-gen4-scif
169+
- renesas,scif-r9a07g044
170+
- renesas,scif-r9a07g054
156171
then:
157172
required:
158173
- resets

Documentation/driver-api/serial/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ Support for Serial devices
99

1010

1111
driver
12-
tty
1312

1413
Serial drivers
1514
==============

Documentation/driver-api/serial/n_gsm.rst

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@ How to use it
1818
1.1 initialize the modem in 0710 mux mode (usually AT+CMUX= command) through
1919
its serial port. Depending on the modem used, you can pass more or less
2020
parameters to this command.
21+
2122
1.2 switch the serial line to using the n_gsm line discipline by using
2223
TIOCSETD ioctl.
24+
2325
1.3 configure the mux using GSMIOC_GETCONF / GSMIOC_SETCONF ioctl.
26+
2427
1.4 obtain base gsmtty number for the used serial port.
2528

2629
Major parts of the initialization program :
@@ -95,10 +98,13 @@ Major parts of the initialization program :
9598

9699
2.1 receive string "AT+CMUX= command" through its serial port,initialize
97100
mux mode config
101+
98102
2.2 switch the serial line to using the n_gsm line discipline by using
99103
TIOCSETD ioctl.
104+
100105
2.3 configure the mux using GSMIOC_GETCONF / GSMIOC_SETCONF ioctl.
101-
2.4 obtain base gsmtty number for the used serial port,
106+
107+
2.4 obtain base gsmtty number for the used serial port::
102108

103109
#include <stdio.h>
104110
#include <stdint.h>

0 commit comments

Comments
 (0)