Skip to content

Commit 1f944f9

Browse files
torvaldstorvalds
committed
Merge tag 'tty-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial updates from Greg KH: "Here is the big set of TTY / Serial patches for 5.7-rc1 Lots of console fixups and reworking in here, serial core tweaks (doesn't that ever get old, why are we still creating new serial devices?), serial driver updates, line-protocol driver updates, and some vt cleanups and fixes included in here as well. All have been in linux-next with no reported issues" * tag 'tty-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (161 commits) serial: 8250: Optimize irq enable after console write serial: 8250: Fix rs485 delay after console write vt: vt_ioctl: fix use-after-free in vt_in_use() vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console tty: serial: make SERIAL_SPRD depend on COMMON_CLK tty: serial: fsl_lpuart: fix return value checking tty: serial: fsl_lpuart: move dma_request_chan() ARM: dts: tango4: Make /serial compatible with ns16550a ARM: dts: mmp*: Make the serial ports compatible with xscale-uart ARM: dts: mmp*: Fix serial port names ARM: dts: mmp2-brownstone: Don't redeclare phandle references ARM: dts: pxa*: Make the serial ports compatible with xscale-uart ARM: dts: pxa*: Fix serial port names ARM: dts: pxa*: Don't redeclare phandle references serial: omap: drop unused dt-bindings header serial: 8250: 8250_omap: Add DMA support for UARTs on K3 SoCs serial: 8250: 8250_omap: Work around errata causing spurious IRQs with DMA serial: 8250: 8250_omap: Extend driver data to pass FIFO trigger info serial: 8250: 8250_omap: Move locking out from __dma_rx_do_complete() serial: 8250: 8250_omap: Account for data in flight during DMA teardown ...
2 parents dfabb07 + 8d5b305 commit 1f944f9

Some content is hidden

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

80 files changed

+2552
-1793
lines changed

‎Documentation/ABI/testing/sysfs-tty

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,3 +154,10 @@ Description:
154154
device specification. For example, when user sets 7bytes on
155155
16550A, which has 1/4/8/14 bytes trigger, the RX trigger is
156156
automatically changed to 4 bytes.
157+
158+
What: /sys/class/tty/ttyS0/console
159+
Date: February 2020
160+
Contact: Andy Shevchenko <[email protected]>
161+
Description:
162+
Allows user to detach or attach back the given device as
163+
kernel console. It shows and accepts a boolean variable.

‎Documentation/devicetree/bindings/serial/fsl-imx-uart.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ Required properties:
88
Optional properties:
99
- fsl,dte-mode : Indicate the uart works in DTE mode. The uart works
1010
in DCE mode by default.
11+
- fsl,inverted-tx , fsl,inverted-rx : Indicate that the hardware attached
12+
to the peripheral inverts the signal transmitted or received,
13+
respectively, and that the peripheral should invert its output/input
14+
using the INVT/INVR registers.
1115
- rs485-rts-delay, rs485-rts-active-low, rs485-rx-during-tx,
1216
linux,rs485-enabled-at-boot-time: see rs485.txt. Note that for RS485
1317
you must enable either the "uart-has-rtscts" or the "rts-gpios"

‎Documentation/devicetree/bindings/serial/fsl-lpuart.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Required properties:
66
on Vybrid vf610 SoC with 8-bit register organization
77
- "fsl,ls1021a-lpuart" for lpuart compatible with the one integrated
88
on LS1021A SoC with 32-bit big-endian register organization
9+
- "fsl,ls1028a-lpuart" for lpuart compatible with the one integrated
10+
on LS1028A SoC with 32-bit little-endian register organization
911
- "fsl,imx7ulp-lpuart" for lpuart compatible with the one integrated
1012
on i.MX7ULP SoC with 32-bit little-endian register organization
1113
- "fsl,imx8qxp-lpuart" for lpuart compatible with the one integrated
@@ -15,10 +17,10 @@ Required properties:
1517
- reg : Address and length of the register set for the device
1618
- interrupts : Should contain uart interrupt
1719
- clocks : phandle + clock specifier pairs, one for each entry in clock-names
18-
- clock-names : For vf610/ls1021a/imx7ulp, "ipg" clock is for uart bus/baud
19-
clock. For imx8qxp lpuart, "ipg" clock is bus clock that is used to access
20-
lpuart controller registers, it also requires "baud" clock for module to
21-
receive/transmit data.
20+
- clock-names : For vf610/ls1021a/ls1028a/imx7ulp, "ipg" clock is for uart
21+
bus/baud clock. For imx8qxp lpuart, "ipg" clock is bus clock that is used
22+
to access lpuart controller registers, it also requires "baud" clock for
23+
module to receive/transmit data.
2224

2325
Optional properties:
2426
- dmas: A list of two dma specifiers, one for each entry in dma-names.

‎arch/arm/boot/dts/mmp2-brownstone.dts

Lines changed: 165 additions & 167 deletions
Original file line numberDiff line numberDiff line change
@@ -19,176 +19,174 @@
1919
device_type = "memory";
2020
reg = <0x00000000 0x08000000>;
2121
};
22+
};
23+
24+
&uart3 {
25+
status = "okay";
26+
};
2227

23-
soc {
24-
apb@d4000000 {
25-
uart3: uart@d4018000 {
26-
status = "okay";
27-
};
28-
twsi1: i2c@d4011000 {
29-
status = "okay";
30-
pmic: max8925@3c {
31-
compatible = "maxium,max8925";
32-
reg = <0x3c>;
33-
interrupts = <1>;
34-
interrupt-parent = <&intcmux4>;
35-
interrupt-controller;
36-
#interrupt-cells = <1>;
37-
maxim,tsc-irq = <0>;
28+
&twsi1 {
29+
status = "okay";
30+
pmic: max8925@3c {
31+
compatible = "maxium,max8925";
32+
reg = <0x3c>;
33+
interrupts = <1>;
34+
interrupt-parent = <&intcmux4>;
35+
interrupt-controller;
36+
#interrupt-cells = <1>;
37+
maxim,tsc-irq = <0>;
3838

39-
regulators {
40-
SDV1 {
41-
regulator-min-microvolt = <637500>;
42-
regulator-max-microvolt = <1425000>;
43-
regulator-boot-on;
44-
regulator-always-on;
45-
};
46-
SDV2 {
47-
regulator-min-microvolt = <650000>;
48-
regulator-max-microvolt = <2225000>;
49-
regulator-boot-on;
50-
regulator-always-on;
51-
};
52-
SDV3 {
53-
regulator-min-microvolt = <750000>;
54-
regulator-max-microvolt = <3900000>;
55-
regulator-boot-on;
56-
regulator-always-on;
57-
};
58-
LDO1 {
59-
regulator-min-microvolt = <750000>;
60-
regulator-max-microvolt = <3900000>;
61-
regulator-boot-on;
62-
regulator-always-on;
63-
};
64-
LDO2 {
65-
regulator-min-microvolt = <650000>;
66-
regulator-max-microvolt = <2250000>;
67-
regulator-boot-on;
68-
regulator-always-on;
69-
};
70-
LDO3 {
71-
regulator-min-microvolt = <650000>;
72-
regulator-max-microvolt = <2250000>;
73-
regulator-boot-on;
74-
regulator-always-on;
75-
};
76-
LDO4 {
77-
regulator-min-microvolt = <750000>;
78-
regulator-max-microvolt = <3900000>;
79-
regulator-boot-on;
80-
regulator-always-on;
81-
};
82-
LDO5 {
83-
regulator-min-microvolt = <750000>;
84-
regulator-max-microvolt = <3900000>;
85-
regulator-boot-on;
86-
regulator-always-on;
87-
};
88-
LDO6 {
89-
regulator-min-microvolt = <750000>;
90-
regulator-max-microvolt = <3900000>;
91-
regulator-boot-on;
92-
regulator-always-on;
93-
};
94-
LDO7 {
95-
regulator-min-microvolt = <750000>;
96-
regulator-max-microvolt = <3900000>;
97-
regulator-boot-on;
98-
regulator-always-on;
99-
};
100-
LDO8 {
101-
regulator-min-microvolt = <750000>;
102-
regulator-max-microvolt = <3900000>;
103-
regulator-boot-on;
104-
regulator-always-on;
105-
};
106-
LDO9 {
107-
regulator-min-microvolt = <750000>;
108-
regulator-max-microvolt = <3900000>;
109-
regulator-boot-on;
110-
regulator-always-on;
111-
};
112-
LDO10 {
113-
regulator-min-microvolt = <750000>;
114-
regulator-max-microvolt = <3900000>;
115-
};
116-
LDO11 {
117-
regulator-min-microvolt = <750000>;
118-
regulator-max-microvolt = <3900000>;
119-
regulator-boot-on;
120-
regulator-always-on;
121-
};
122-
LDO12 {
123-
regulator-min-microvolt = <750000>;
124-
regulator-max-microvolt = <3900000>;
125-
regulator-boot-on;
126-
regulator-always-on;
127-
};
128-
LDO13 {
129-
regulator-min-microvolt = <750000>;
130-
regulator-max-microvolt = <3900000>;
131-
regulator-boot-on;
132-
regulator-always-on;
133-
};
134-
LDO14 {
135-
regulator-min-microvolt = <750000>;
136-
regulator-max-microvolt = <3900000>;
137-
regulator-boot-on;
138-
regulator-always-on;
139-
};
140-
LDO15 {
141-
regulator-min-microvolt = <750000>;
142-
regulator-max-microvolt = <3900000>;
143-
regulator-boot-on;
144-
regulator-always-on;
145-
};
146-
LDO16 {
147-
regulator-min-microvolt = <750000>;
148-
regulator-max-microvolt = <3900000>;
149-
regulator-boot-on;
150-
regulator-always-on;
151-
};
152-
LDO17 {
153-
regulator-min-microvolt = <650000>;
154-
regulator-max-microvolt = <2250000>;
155-
regulator-boot-on;
156-
regulator-always-on;
157-
};
158-
LDO18 {
159-
regulator-min-microvolt = <650000>;
160-
regulator-max-microvolt = <2250000>;
161-
regulator-boot-on;
162-
regulator-always-on;
163-
};
164-
LDO19 {
165-
regulator-min-microvolt = <750000>;
166-
regulator-max-microvolt = <3900000>;
167-
regulator-boot-on;
168-
regulator-always-on;
169-
};
170-
LDO20 {
171-
regulator-min-microvolt = <750000>;
172-
regulator-max-microvolt = <3900000>;
173-
regulator-boot-on;
174-
regulator-always-on;
175-
};
176-
};
177-
backlight {
178-
maxim,max8925-dual-string = <0>;
179-
};
180-
charger {
181-
batt-detect = <0>;
182-
topoff-threshold = <1>;
183-
fast-charge = <7>;
184-
no-temp-support = <0>;
185-
no-insert-detect = <0>;
186-
};
187-
};
188-
};
189-
rtc: rtc@d4010000 {
190-
status = "okay";
39+
regulators {
40+
SDV1 {
41+
regulator-min-microvolt = <637500>;
42+
regulator-max-microvolt = <1425000>;
43+
regulator-boot-on;
44+
regulator-always-on;
45+
};
46+
SDV2 {
47+
regulator-min-microvolt = <650000>;
48+
regulator-max-microvolt = <2225000>;
49+
regulator-boot-on;
50+
regulator-always-on;
51+
};
52+
SDV3 {
53+
regulator-min-microvolt = <750000>;
54+
regulator-max-microvolt = <3900000>;
55+
regulator-boot-on;
56+
regulator-always-on;
57+
};
58+
LDO1 {
59+
regulator-min-microvolt = <750000>;
60+
regulator-max-microvolt = <3900000>;
61+
regulator-boot-on;
62+
regulator-always-on;
63+
};
64+
LDO2 {
65+
regulator-min-microvolt = <650000>;
66+
regulator-max-microvolt = <2250000>;
67+
regulator-boot-on;
68+
regulator-always-on;
69+
};
70+
LDO3 {
71+
regulator-min-microvolt = <650000>;
72+
regulator-max-microvolt = <2250000>;
73+
regulator-boot-on;
74+
regulator-always-on;
75+
};
76+
LDO4 {
77+
regulator-min-microvolt = <750000>;
78+
regulator-max-microvolt = <3900000>;
79+
regulator-boot-on;
80+
regulator-always-on;
81+
};
82+
LDO5 {
83+
regulator-min-microvolt = <750000>;
84+
regulator-max-microvolt = <3900000>;
85+
regulator-boot-on;
86+
regulator-always-on;
87+
};
88+
LDO6 {
89+
regulator-min-microvolt = <750000>;
90+
regulator-max-microvolt = <3900000>;
91+
regulator-boot-on;
92+
regulator-always-on;
93+
};
94+
LDO7 {
95+
regulator-min-microvolt = <750000>;
96+
regulator-max-microvolt = <3900000>;
97+
regulator-boot-on;
98+
regulator-always-on;
99+
};
100+
LDO8 {
101+
regulator-min-microvolt = <750000>;
102+
regulator-max-microvolt = <3900000>;
103+
regulator-boot-on;
104+
regulator-always-on;
105+
};
106+
LDO9 {
107+
regulator-min-microvolt = <750000>;
108+
regulator-max-microvolt = <3900000>;
109+
regulator-boot-on;
110+
regulator-always-on;
111+
};
112+
LDO10 {
113+
regulator-min-microvolt = <750000>;
114+
regulator-max-microvolt = <3900000>;
191115
};
116+
LDO11 {
117+
regulator-min-microvolt = <750000>;
118+
regulator-max-microvolt = <3900000>;
119+
regulator-boot-on;
120+
regulator-always-on;
121+
};
122+
LDO12 {
123+
regulator-min-microvolt = <750000>;
124+
regulator-max-microvolt = <3900000>;
125+
regulator-boot-on;
126+
regulator-always-on;
127+
};
128+
LDO13 {
129+
regulator-min-microvolt = <750000>;
130+
regulator-max-microvolt = <3900000>;
131+
regulator-boot-on;
132+
regulator-always-on;
133+
};
134+
LDO14 {
135+
regulator-min-microvolt = <750000>;
136+
regulator-max-microvolt = <3900000>;
137+
regulator-boot-on;
138+
regulator-always-on;
139+
};
140+
LDO15 {
141+
regulator-min-microvolt = <750000>;
142+
regulator-max-microvolt = <3900000>;
143+
regulator-boot-on;
144+
regulator-always-on;
145+
};
146+
LDO16 {
147+
regulator-min-microvolt = <750000>;
148+
regulator-max-microvolt = <3900000>;
149+
regulator-boot-on;
150+
regulator-always-on;
151+
};
152+
LDO17 {
153+
regulator-min-microvolt = <650000>;
154+
regulator-max-microvolt = <2250000>;
155+
regulator-boot-on;
156+
regulator-always-on;
157+
};
158+
LDO18 {
159+
regulator-min-microvolt = <650000>;
160+
regulator-max-microvolt = <2250000>;
161+
regulator-boot-on;
162+
regulator-always-on;
163+
};
164+
LDO19 {
165+
regulator-min-microvolt = <750000>;
166+
regulator-max-microvolt = <3900000>;
167+
regulator-boot-on;
168+
regulator-always-on;
169+
};
170+
LDO20 {
171+
regulator-min-microvolt = <750000>;
172+
regulator-max-microvolt = <3900000>;
173+
regulator-boot-on;
174+
regulator-always-on;
175+
};
176+
};
177+
backlight {
178+
maxim,max8925-dual-string = <0>;
179+
};
180+
charger {
181+
batt-detect = <0>;
182+
topoff-threshold = <1>;
183+
fast-charge = <7>;
184+
no-temp-support = <0>;
185+
no-insert-detect = <0>;
192186
};
193187
};
194188
};
189+
190+
&rtc {
191+
status = "okay";
192+
};

0 commit comments

Comments
 (0)