Skip to content

Commit 17cd4d6

Browse files
committed
Merge tag 'tty-6.3-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.3-rc1. Once again, Jiri and Ilpo have done a number of core vt and tty/serial layer cleanups that were much needed and appreciated. Other than that, it's just a bunch of little tty/serial driver updates: - qcom-geni-serial driver updates - liteuart driver updates - hvcs driver cleanups - n_gsm updates and additions for new features - more 8250 device support added - fpga/dfl update and additions - imx serial driver updates - fsl_lpuart updates - other tiny fixes and updates for serial drivers All of these have been in linux-next for a while with no reported problems" * tag 'tty-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (143 commits) tty: n_gsm: add keep alive support serial: imx: remove a redundant check dt-bindings: serial: snps-dw-apb-uart: add dma & dma-names properties soc: qcom: geni-se: Move qcom-geni-se.h to linux/soc/qcom/geni-se.h tty: n_gsm: add TIOCMIWAIT support tty: n_gsm: add RING/CD control support tty: n_gsm: mark unusable ioctl structure fields accordingly serial: imx: get rid of registers shadowing serial: imx: refine local variables in rxint() serial: imx: stop using USR2 in FIFO reading loop serial: imx: remove redundant USR2 read from FIFO reading loop serial: imx: do not break from FIFO reading loop prematurely serial: imx: do not sysrq broken chars serial: imx: work-around for hardware RX flood serial: imx: factor-out common code to imx_uart_soft_reset() serial: 8250_pci1xxxx: Add power management functions to quad-uart driver serial: 8250_pci1xxxx: Add RS485 support to quad-uart driver serial: 8250_pci1xxxx: Add driver for quad-uart support serial: 8250_pci: Add serial8250_pci_setup_port definition in 8250_pcilib.c tty: pcn_uart: fix memory leak with using debugfs_lookup() ...
2 parents 72bffe7 + 72206cc commit 17cd4d6

File tree

104 files changed

+2908
-1283
lines changed

Some content is hidden

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

104 files changed

+2908
-1283
lines changed

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,10 +1172,10 @@
11721172
specified, the serial port must already be setup and
11731173
configured.
11741174

1175-
uart[8250],io,<addr>[,options]
1176-
uart[8250],mmio,<addr>[,options]
1177-
uart[8250],mmio32,<addr>[,options]
1178-
uart[8250],mmio32be,<addr>[,options]
1175+
uart[8250],io,<addr>[,options[,uartclk]]
1176+
uart[8250],mmio,<addr>[,options[,uartclk]]
1177+
uart[8250],mmio32,<addr>[,options[,uartclk]]
1178+
uart[8250],mmio32be,<addr>[,options[,uartclk]]
11791179
uart[8250],0x<addr>[,options]
11801180
Start an early, polled-mode console on the 8250/16550
11811181
UART at the specified I/O port or MMIO address.
@@ -1184,7 +1184,9 @@
11841184
If none of [io|mmio|mmio32|mmio32be], <addr> is assumed
11851185
to be equivalent to 'mmio'. 'options' are specified
11861186
in the same format described for "console=ttyS<n>"; if
1187-
unspecified, the h/w is not initialized.
1187+
unspecified, the h/w is not initialized. 'uartclk' is
1188+
the uart clock frequency; if unspecified, it is set
1189+
to 'BASE_BAUD' * 16.
11881190

11891191
pl011,<addr>
11901192
pl011,mmio32,<addr>

Documentation/devicetree/bindings/serial/8250.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ properties:
6262
- const: mrvl,pxa-uart
6363
- const: nuvoton,wpcm450-uart
6464
- const: nuvoton,npcm750-uart
65-
- const: nuvoton,npcm845-uart
6665
- const: nvidia,tegra20-uart
6766
- const: nxp,lpc3220-uart
6867
- items:
@@ -92,6 +91,10 @@ properties:
9291
- enum:
9392
- ns16550 # Deprecated, unless the FIFO really is broken
9493
- ns16550a
94+
- items:
95+
- enum:
96+
- nuvoton,npcm845-uart
97+
- const: nuvoton,npcm750-uart
9598
- items:
9699
- enum:
97100
- ralink,mt7620a-uart
@@ -200,12 +203,13 @@ properties:
200203
deprecated: true
201204

202205
aspeed,lpc-io-reg:
203-
$ref: '/schemas/types.yaml#/definitions/uint32'
206+
$ref: /schemas/types.yaml#/definitions/uint32-array
207+
maxItems: 1
204208
description: |
205209
The VUART LPC address. Only applicable to aspeed,ast2500-vuart.
206210
207211
aspeed,lpc-interrupts:
208-
$ref: "/schemas/types.yaml#/definitions/uint32-array"
212+
$ref: /schemas/types.yaml#/definitions/uint32-array
209213
minItems: 2
210214
maxItems: 2
211215
description: |

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

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@ properties:
7070
dsr-gpios: true
7171
rng-gpios: true
7272
dcd-gpios: true
73-
rs485-rts-delay: true
74-
rs485-rts-active-low: true
75-
rs485-rx-during-tx: true
76-
rs485-rts-active-high: true
77-
linux,rs485-enabled-at-boot-time: true
7873
rts-gpio: true
7974
power-domains: true
8075
clock-frequency: true
@@ -109,12 +104,12 @@ else:
109104

110105
examples:
111106
- |
112-
serial@49042000 {
113-
compatible = "ti,omap3-uart";
114-
reg = <0x49042000 0x400>;
115-
interrupts = <80>;
116-
dmas = <&sdma 81 &sdma 82>;
117-
dma-names = "tx", "rx";
118-
ti,hwmods = "uart4";
119-
clock-frequency = <48000000>;
120-
};
107+
serial@49042000 {
108+
compatible = "ti,omap3-uart";
109+
reg = <0x49042000 0x400>;
110+
interrupts = <80>;
111+
dmas = <&sdma 81 &sdma 82>;
112+
dma-names = "tx", "rx";
113+
ti,hwmods = "uart4";
114+
clock-frequency = <48000000>;
115+
};

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ description: |
1919
is active since power-on and does not need any clock gating and is usable
2020
as very early serial console.
2121
22+
allOf:
23+
- $ref: serial.yaml#
24+
2225
properties:
2326
compatible:
2427
oneOf:
@@ -69,14 +72,14 @@ required:
6972
- clocks
7073
- clock-names
7174

72-
additionalProperties: false
75+
unevaluatedProperties: false
7376

7477
examples:
7578
- |
7679
serial@84c0 {
77-
compatible = "amlogic,meson-gx-uart";
78-
reg = <0x84c0 0x14>;
79-
interrupts = <26>;
80-
clocks = <&xtal>, <&pclk>, <&xtal>;
81-
clock-names = "xtal", "pclk", "baud";
80+
compatible = "amlogic,meson-gx-uart";
81+
reg = <0x84c0 0x14>;
82+
interrupts = <26>;
83+
clocks = <&xtal>, <&pclk>, <&xtal>;
84+
clock-names = "xtal", "pclk", "baud";
8285
};

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

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ title: Cadence UART Controller
99
maintainers:
1010
- Michal Simek <[email protected]>
1111

12-
allOf:
13-
- $ref: /schemas/serial.yaml#
14-
1512
properties:
1613
compatible:
1714
oneOf:
@@ -46,21 +43,35 @@ properties:
4643
port does not use this pin.
4744
type: boolean
4845

46+
power-domains:
47+
maxItems: 1
48+
4949
required:
5050
- compatible
5151
- reg
5252
- interrupts
5353
- clocks
5454
- clock-names
5555

56+
allOf:
57+
- $ref: serial.yaml#
58+
- if:
59+
properties:
60+
compatible:
61+
contains:
62+
const: cdns,uart-r1p8
63+
then:
64+
properties:
65+
power-domains: false
66+
5667
unevaluatedProperties: false
5768

5869
examples:
5970
- |
6071
uart0: serial@e0000000 {
61-
compatible = "xlnx,xuartps", "cdns,uart-r1p8";
62-
clocks = <&clkc 23>, <&clkc 40>;
63-
clock-names = "uart_clk", "pclk";
64-
reg = <0xE0000000 0x1000>;
65-
interrupts = <0 27 4>;
72+
compatible = "xlnx,xuartps", "cdns,uart-r1p8";
73+
clocks = <&clkc 23>, <&clkc 40>;
74+
clock-names = "uart_clk", "pclk";
75+
reg = <0xe0000000 0x1000>;
76+
interrupts = <0 27 4>;
6677
};

Documentation/devicetree/bindings/serial/fsl,s32-linflexuart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ maintainers:
1616
- Chester Lin <[email protected]>
1717

1818
allOf:
19-
- $ref: "serial.yaml"
19+
- $ref: serial.yaml#
2020

2121
properties:
2222
compatible:

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ maintainers:
1010
- Fabio Estevam <[email protected]>
1111

1212
allOf:
13-
- $ref: "serial.yaml"
14-
- $ref: "rs485.yaml"
13+
- $ref: serial.yaml#
14+
- $ref: rs485.yaml#
1515

1616
properties:
1717
compatible:
@@ -83,13 +83,6 @@ properties:
8383
are sensible for most use cases. If you need low latency processing on
8484
slow connections this needs to be configured appropriately.
8585
86-
uart-has-rtscts: true
87-
88-
rs485-rts-delay: true
89-
rs485-rts-active-low: true
90-
rs485-rx-during-tx: true
91-
linux,rs485-enabled-at-boot-time: true
92-
9386
required:
9487
- compatible
9588
- reg

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ maintainers:
1010
- Fugang Duan <[email protected]>
1111

1212
allOf:
13-
- $ref: "rs485.yaml"
13+
- $ref: rs485.yaml#
14+
- $ref: serial.yaml#
1415

1516
properties:
1617
compatible:
@@ -64,9 +65,6 @@ properties:
6465
- const: rx
6566
- const: tx
6667

67-
rs485-rts-active-low: true
68-
linux,rs485-enabled-at-boot-time: true
69-
7068
required:
7169
- compatible
7270
- reg

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ maintainers:
1010
- Fabio Estevam <[email protected]>
1111

1212
allOf:
13-
- $ref: "serial.yaml"
13+
- $ref: serial.yaml#
1414

1515
properties:
1616
compatible:

Documentation/devicetree/bindings/serial/pl011.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ maintainers:
1010
- Rob Herring <[email protected]>
1111

1212
allOf:
13+
- $ref: /schemas/arm/primecell.yaml#
1314
- $ref: serial.yaml#
1415

1516
# Need a custom select here or 'arm,primecell' will match on lots of nodes

0 commit comments

Comments
 (0)