Skip to content

Commit 356a031

Browse files
committed
Merge tag 'tty-6.12-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 6.12-rc1. Nothing major in here, just nice forward progress in the slow cleanup of the serial apis, and lots of other driver updates and fixes. Included in here are: - serial api updates from Jiri to make things more uniform and sane - 8250_platform driver cleanups - samsung serial driver fixes and updates - qcom-geni serial driver fixes from Johan for the bizarre UART engine that that chip seems to have. Hopefully it's in a better state now, but hardware designers still seem to come up with more ways to make broken UARTS 40+ years after this all should have finished. - sc16is7xx driver updates - omap 8250 driver updates - 8250_bcm2835aux driver updates - a few new serial driver bindings added - other serial minor driver updates All of these have been in linux-next for a long time with no reported problems" * tag 'tty-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (65 commits) tty: serial: samsung: Fix serial rx on Apple A7-A9 tty: serial: samsung: Fix A7-A11 serial earlycon SError tty: serial: samsung: Use bit manipulation macros for APPLE_S5L_* tty: rp2: Fix reset with non forgiving PCIe host bridges serial: 8250_aspeed_vuart: Enable module autoloading serial: qcom-geni: fix polled console corruption serial: qcom-geni: disable interrupts during console writes serial: qcom-geni: fix console corruption serial: qcom-geni: introduce qcom_geni_serial_poll_bitfield() serial: qcom-geni: fix arg types for qcom_geni_serial_poll_bit() soc: qcom: geni-se: add GP_LENGTH/IRQ_EN_SET/IRQ_EN_CLEAR registers serial: qcom-geni: fix false console tx restart serial: qcom-geni: fix fifo polling timeout tty: hvc: convert comma to semicolon mxser: convert comma to semicolon serial: 8250_bcm2835aux: Fix clock imbalance in PM resume serial: sc16is7xx: convert bitmask definitions to use BIT() macro serial: sc16is7xx: fix copy-paste errors in EFR_SWFLOWx_BIT constants serial: sc16is7xx: remove SC16IS7XX_MSR_DELTA_MASK serial: xilinx_uartps: Make cdns_rs485_supported static ...
2 parents 4965ddb + 5ed771f commit 356a031

35 files changed

+623
-426
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ properties:
7676
clock-frequency: true
7777
current-speed: true
7878
overrun-throttle-ms: true
79+
wakeup-source: true
7980

8081
required:
8182
- compatible

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,20 @@ properties:
2323
- const: atmel,at91sam9260-dbgu
2424
- const: atmel,at91sam9260-usart
2525
- items:
26-
- const: microchip,sam9x60-usart
26+
- enum:
27+
- microchip,sam9x60-usart
28+
- microchip,sam9x7-usart
2729
- const: atmel,at91sam9260-usart
2830
- items:
2931
- const: microchip,sam9x60-dbgu
3032
- const: microchip,sam9x60-usart
3133
- const: atmel,at91sam9260-dbgu
3234
- const: atmel,at91sam9260-usart
35+
- items:
36+
- const: microchip,sam9x7-dbgu
37+
- const: atmel,at91sam9260-dbgu
38+
- const: microchip,sam9x7-usart
39+
- const: atmel,at91sam9260-usart
3340

3441
reg:
3542
maxItems: 1

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ properties:
3636
- mediatek,mt7622-uart
3737
- mediatek,mt7623-uart
3838
- mediatek,mt7629-uart
39+
- mediatek,mt7981-uart
3940
- mediatek,mt7986-uart
4041
- mediatek,mt7988-uart
4142
- mediatek,mt8127-uart

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ properties:
4646
- items:
4747
- enum:
4848
- renesas,scif-r8a774a1 # RZ/G2M
49+
- renesas,scif-r8a774a3 # RZ/G2M v3.0
4950
- renesas,scif-r8a774b1 # RZ/G2N
5051
- renesas,scif-r8a774c0 # RZ/G2E
5152
- renesas,scif-r8a774e1 # RZ/G2H

Documentation/devicetree/bindings/serial/samsung_uart.yaml

Lines changed: 56 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,8 @@ properties:
5656
maxItems: 5
5757

5858
clock-names:
59-
description: N = 0 is allowed for SoCs without internal baud clock mux.
6059
minItems: 2
61-
items:
62-
- const: uart
63-
- pattern: '^clk_uart_baud[0-3]$'
64-
- pattern: '^clk_uart_baud[0-3]$'
65-
- pattern: '^clk_uart_baud[0-3]$'
66-
- pattern: '^clk_uart_baud[0-3]$'
60+
maxItems: 5
6761

6862
dmas:
6963
items:
@@ -103,18 +97,45 @@ allOf:
10397
compatible:
10498
contains:
10599
enum:
106-
- samsung,s5pv210-uart
100+
- samsung,s3c6400-uart
107101
then:
108102
properties:
109103
clocks:
110-
minItems: 2
104+
minItems: 3
111105
maxItems: 3
106+
107+
clock-names:
108+
items:
109+
- const: uart
110+
- const: clk_uart_baud2
111+
- const: clk_uart_baud3
112+
113+
else:
114+
properties:
112115
clock-names:
113116
minItems: 2
114117
items:
115118
- const: uart
116-
- pattern: '^clk_uart_baud[0-1]$'
117-
- pattern: '^clk_uart_baud[0-1]$'
119+
- const: clk_uart_baud0
120+
- const: clk_uart_baud1
121+
- const: clk_uart_baud2
122+
- const: clk_uart_baud3
123+
124+
- if:
125+
properties:
126+
compatible:
127+
contains:
128+
enum:
129+
- samsung,s5pv210-uart
130+
then:
131+
properties:
132+
clocks:
133+
minItems: 3
134+
maxItems: 3
135+
136+
clock-names:
137+
minItems: 3
138+
maxItems: 3
118139

119140
- if:
120141
properties:
@@ -129,10 +150,9 @@ allOf:
129150
properties:
130151
clocks:
131152
maxItems: 2
153+
132154
clock-names:
133-
items:
134-
- const: uart
135-
- const: clk_uart_baud0
155+
maxItems: 2
136156

137157
- if:
138158
properties:
@@ -146,6 +166,12 @@ allOf:
146166
properties:
147167
reg-io-width: false
148168

169+
clocks:
170+
maxItems: 2
171+
172+
clock-names:
173+
maxItems: 2
174+
149175
unevaluatedProperties: false
150176

151177
examples:
@@ -163,3 +189,19 @@ examples:
163189
<&clocks SCLK_UART>;
164190
samsung,uart-fifosize = <16>;
165191
};
192+
- |
193+
#include <dt-bindings/clock/google,gs101.h>
194+
#include <dt-bindings/interrupt-controller/arm-gic.h>
195+
#include <dt-bindings/interrupt-controller/irq.h>
196+
197+
serial_0: serial@10a00000 {
198+
compatible = "google,gs101-uart";
199+
reg = <0x10a00000 0xc0>;
200+
clocks = <&cmu_peric0 CLK_GOUT_PERIC0_PERIC0_TOP1_PCLK_0>,
201+
<&cmu_peric0 CLK_GOUT_PERIC0_PERIC0_TOP1_IPCLK_0>;
202+
clock-names = "uart", "clk_uart_baud0";
203+
interrupts = <GIC_SPI 634 IRQ_TYPE_LEVEL_HIGH 0>;
204+
pinctrl-0 = <&uart0_bus>;
205+
pinctrl-names = "default";
206+
samsung,uart-fifosize = <256>;
207+
};

arch/arm64/boot/dts/mediatek/mt7981b.dtsi

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,39 @@
9494
#pwm-cells = <2>;
9595
};
9696

97+
serial@11002000 {
98+
compatible = "mediatek,mt7981-uart", "mediatek,mt6577-uart";
99+
reg = <0 0x11002000 0 0x100>;
100+
interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;
101+
interrupt-names = "uart", "wakeup";
102+
clocks = <&infracfg CLK_INFRA_UART0_SEL>,
103+
<&infracfg CLK_INFRA_UART0_CK>;
104+
clock-names = "baud", "bus";
105+
status = "disabled";
106+
};
107+
108+
serial@11003000 {
109+
compatible = "mediatek,mt7981-uart", "mediatek,mt6577-uart";
110+
reg = <0 0x11003000 0 0x100>;
111+
interrupts = <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>;
112+
interrupt-names = "uart", "wakeup";
113+
clocks = <&infracfg CLK_INFRA_UART1_SEL>,
114+
<&infracfg CLK_INFRA_UART1_CK>;
115+
clock-names = "baud", "bus";
116+
status = "disabled";
117+
};
118+
119+
serial@11004000 {
120+
compatible = "mediatek,mt7981-uart", "mediatek,mt6577-uart";
121+
reg = <0 0x11004000 0 0x100>;
122+
interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;
123+
interrupt-names = "uart", "wakeup";
124+
clocks = <&infracfg CLK_INFRA_UART2_SEL>,
125+
<&infracfg CLK_INFRA_UART2_CK>;
126+
clock-names = "baud", "bus";
127+
status = "disabled";
128+
};
129+
97130
i2c@11007000 {
98131
compatible = "mediatek,mt7981-i2c";
99132
reg = <0 0x11007000 0 0x1000>,

0 commit comments

Comments
 (0)