Skip to content

Commit 37c8596

Browse files
torvaldstorvalds
committed
Merge tag 'tty-4.11-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 tty/serial driver patchset for 4.11-rc1. Not much here, but a lot of little fixes and individual serial driver updates all over the subsystem. Majority are for the sh-sci driver and platform (the arch-specific changes have acks from the maintainer). The start of the "serial bus" code is here as well, but nothing is converted to use it yet. That work is still ongoing, hopefully will start to show up across different subsystems for 4.12 (bluetooth is one major place that will be used.) All of these have been in linux-next for a while with no reported issues" * tag 'tty-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (109 commits) tty: pl011: Work around QDF2400 E44 stuck BUSY bit atmel_serial: Use the fractional divider when possible tty: Remove extra include in HVC console tty framework serial: exar: Enable MSI support serial: exar: Move register defines from uapi header to consumer site serial: pci: Remove unused pci_boards entries serial: exar: Move Commtech adapters to 8250_exar as well serial: exar: Fix feature control register constants serial: exar: Fix initialization of EXAR registers for ports > 0 serial: exar: Fix mapping of port I/O resources serial: sh-sci: fix hardware RX trigger level setting tty/serial: atmel: ensure state is restored after suspending serial: 8250_dw: Avoid "too much work" from bogus rx timeout interrupt serdev: ttyport: check whether tty_init_dev() fails serial: 8250_pci: make pciserial_detach_ports() static ARM: dts: STiH410-b2260: Enable HW flow-control ARM: dts: STiH407-family: Use new Pinctrl groups ARM: dts: STiH407-pinctrl: Add Pinctrl group for HW flow-control ARM: dts: STiH410-b2260: Identify the UART RTS line dt-bindings: serial: Update 'uart-has-rtscts' description ...
2 parents caa5942 + d8a4995 commit 37c8596

File tree

116 files changed

+3057
-1640
lines changed

Some content is hidden

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

116 files changed

+3057
-1640
lines changed

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -957,6 +957,12 @@
957957
serial port must already be setup and configured.
958958
Options are not yet supported.
959959

960+
lantiq,<addr>
961+
Start an early, polled-mode console on a lantiq serial
962+
(lqasc) port at the specified address. The serial port
963+
must already be setup and configured. Options are not
964+
yet supported.
965+
960966
lpuart,<addr>
961967
lpuart32,<addr>
962968
Use early console provided by Freescale LP UART driver

‎Documentation/devicetree/bindings/serial/8250.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Required properties:
1919
- "altr,16550-FIFO128"
2020
- "fsl,16550-FIFO64"
2121
- "fsl,ns16550"
22+
- "ti,da830-uart"
2223
- "serial" if the port type is unknown.
2324
- reg : offset and length of the register set for the device.
2425
- interrupts : should contain uart interrupt.

‎Documentation/devicetree/bindings/serial/serial.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ Optional properties:
2323
they are available for use (wired and enabled by pinmux configuration).
2424
This depends on both the UART hardware and the board wiring.
2525
Note that this property is mutually-exclusive with "cts-gpios" and
26-
"rts-gpios" above.
26+
"rts-gpios" above, unless support is provided to switch between modes
27+
dynamically.
2728

2829

2930
Examples:

‎Documentation/devicetree/bindings/serial/slave-device.txt

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
Serial Slave Device DT binding
2+
3+
This documents the binding structure and common properties for serial
4+
attached devices. Common examples include Bluetooth, WiFi, NFC and GPS
5+
devices.
6+
7+
Serial attached devices shall be a child node of the host UART device the
8+
slave device is attached to. It is expected that the attached device is
9+
the only child node of the UART device. The slave device node name shall
10+
reflect the generic type of device for the node.
11+
12+
Required Properties:
13+
14+
- compatible : A string reflecting the vendor and specific device the node
15+
represents.
16+
17+
Optional Properties:
18+
19+
- max-speed : The maximum baud rate the device operates at. This should
20+
only be present if the maximum is less than the slave device
21+
can support. For example, a particular board has some signal
22+
quality issue or the host processor can't support higher
23+
baud rates.
24+
25+
Example:
26+
27+
serial@1234 {
28+
compatible = "ns16550a";
29+
interrupts = <1>;
30+
31+
bluetooth {
32+
compatible = "brcm,bcm43341-bt";
33+
interrupt-parent = <&gpio>;
34+
interrupts = <10>;
35+
};
36+
};

‎MAINTAINERS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10927,6 +10927,14 @@ S: Maintained
1092710927
F: Documentation/devicetree/bindings/serial/
1092810928
F: drivers/tty/serial/
1092910929

10930+
SERIAL DEVICE BUS
10931+
M: Rob Herring <robh@kernel.org>
10932+
L: linux-serial@vger.kernel.org
10933+
S: Maintained
10934+
F: Documentation/devicetree/bindings/serial/slave-device.txt
10935+
F: drivers/tty/serdev/
10936+
F: include/linux/serdev.h
10937+
1093010938
SERIAL IR RECEIVER
1093110939
M: Sean Young <sean@mess.org>
1093210940
L: linux-media@vger.kernel.org

‎arch/arm/boot/dts/stih407-family.dtsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,8 @@
222222
compatible = "st,asc";
223223
reg = <0x9830000 0x2c>;
224224
interrupts = <GIC_SPI 122 IRQ_TYPE_NONE>;
225-
pinctrl-names = "default";
226-
pinctrl-0 = <&pinctrl_serial0>;
227225
clocks = <&clk_s_c0_flexgen CLK_EXT2F_A9>;
226+
/* Pinctrl moved out to a per-board configuration */
228227

229228
status = "disabled";
230229
};

‎arch/arm/boot/dts/stih407-pinctrl.dtsi

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,8 +465,16 @@
465465
serial0 {
466466
pinctrl_serial0: serial0-0 {
467467
st,pins {
468-
tx = <&pio17 0 ALT1 OUT>;
469-
rx = <&pio17 1 ALT1 IN>;
468+
tx = <&pio17 0 ALT1 OUT>;
469+
rx = <&pio17 1 ALT1 IN>;
470+
};
471+
};
472+
pinctrl_serial0_hw_flowctrl: serial0-0_hw_flowctrl {
473+
st,pins {
474+
tx = <&pio17 0 ALT1 OUT>;
475+
rx = <&pio17 1 ALT1 IN>;
476+
cts = <&pio17 2 ALT1 IN>;
477+
rts = <&pio17 3 ALT1 OUT>;
470478
};
471479
};
472480
};

‎arch/arm/boot/dts/stih410-b2260.dts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@
6262
/* Low speed expansion connector */
6363
uart0: serial@9830000 {
6464
label = "LS-UART0";
65+
pinctrl-names = "default", "no-hw-flowctrl";
66+
pinctrl-0 = <&pinctrl_serial0_hw_flowctrl>;
67+
pinctrl-1 = <&pinctrl_serial0>;
68+
rts-gpios = <&pio17 3 GPIO_ACTIVE_LOW>;
69+
uart-has-rtscts;
6570
status = "okay";
6671
};
6772

‎arch/sh/kernel/cpu/sh2/setup-sh7619.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL,
6161
NULL, prio_registers, NULL);
6262

6363
static struct plat_sci_port scif0_platform_data = {
64-
.flags = UPF_BOOT_AUTOCONF,
65-
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
64+
.scscr = SCSCR_REIE,
6665
.type = PORT_SCIF,
6766
};
6867

@@ -82,8 +81,7 @@ static struct platform_device scif0_device = {
8281
};
8382

8483
static struct plat_sci_port scif1_platform_data = {
85-
.flags = UPF_BOOT_AUTOCONF,
86-
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
84+
.scscr = SCSCR_REIE,
8785
.type = PORT_SCIF,
8886
};
8987

@@ -103,8 +101,7 @@ static struct platform_device scif1_device = {
103101
};
104102

105103
static struct plat_sci_port scif2_platform_data = {
106-
.flags = UPF_BOOT_AUTOCONF,
107-
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
104+
.scscr = SCSCR_REIE,
108105
.type = PORT_SCIF,
109106
};
110107

‎arch/sh/kernel/cpu/sh2a/setup-mxg.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,7 @@ static struct platform_device mtu2_device = {
129129
};
130130

131131
static struct plat_sci_port scif0_platform_data = {
132-
.flags = UPF_BOOT_AUTOCONF,
133-
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
132+
.scscr = SCSCR_REIE,
134133
.type = PORT_SCIF,
135134
};
136135

‎arch/sh/kernel/cpu/sh2a/setup-sh7201.c

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7201", vectors, groups,
178178
mask_registers, prio_registers, NULL);
179179

180180
static struct plat_sci_port scif0_platform_data = {
181-
.flags = UPF_BOOT_AUTOCONF,
182-
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
181+
.scscr = SCSCR_REIE,
183182
.type = PORT_SCIF,
184183
};
185184

@@ -199,8 +198,7 @@ static struct platform_device scif0_device = {
199198
};
200199

201200
static struct plat_sci_port scif1_platform_data = {
202-
.flags = UPF_BOOT_AUTOCONF,
203-
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
201+
.scscr = SCSCR_REIE,
204202
.type = PORT_SCIF,
205203
};
206204

@@ -220,8 +218,7 @@ static struct platform_device scif1_device = {
220218
};
221219

222220
static struct plat_sci_port scif2_platform_data = {
223-
.flags = UPF_BOOT_AUTOCONF,
224-
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
221+
.scscr = SCSCR_REIE,
225222
.type = PORT_SCIF,
226223
};
227224

@@ -241,8 +238,7 @@ static struct platform_device scif2_device = {
241238
};
242239

243240
static struct plat_sci_port scif3_platform_data = {
244-
.flags = UPF_BOOT_AUTOCONF,
245-
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
241+
.scscr = SCSCR_REIE,
246242
.type = PORT_SCIF,
247243
};
248244

@@ -262,8 +258,7 @@ static struct platform_device scif3_device = {
262258
};
263259

264260
static struct plat_sci_port scif4_platform_data = {
265-
.flags = UPF_BOOT_AUTOCONF,
266-
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
261+
.scscr = SCSCR_REIE,
267262
.type = PORT_SCIF,
268263
};
269264

@@ -283,8 +278,7 @@ static struct platform_device scif4_device = {
283278
};
284279

285280
static struct plat_sci_port scif5_platform_data = {
286-
.flags = UPF_BOOT_AUTOCONF,
287-
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
281+
.scscr = SCSCR_REIE,
288282
.type = PORT_SCIF,
289283
};
290284

@@ -304,8 +298,7 @@ static struct platform_device scif5_device = {
304298
};
305299

306300
static struct plat_sci_port scif6_platform_data = {
307-
.flags = UPF_BOOT_AUTOCONF,
308-
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
301+
.scscr = SCSCR_REIE,
309302
.type = PORT_SCIF,
310303
};
311304

@@ -325,8 +318,7 @@ static struct platform_device scif6_device = {
325318
};
326319

327320
static struct plat_sci_port scif7_platform_data = {
328-
.flags = UPF_BOOT_AUTOCONF,
329-
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
321+
.scscr = SCSCR_REIE,
330322
.type = PORT_SCIF,
331323
};
332324

‎arch/sh/kernel/cpu/sh2a/setup-sh7203.c

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7203", vectors, groups,
174174
mask_registers, prio_registers, NULL);
175175

176176
static struct plat_sci_port scif0_platform_data = {
177-
.flags = UPF_BOOT_AUTOCONF,
178-
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |
179-
SCSCR_REIE,
177+
.scscr = SCSCR_REIE,
180178
.type = PORT_SCIF,
181179
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
182180
};
@@ -197,9 +195,7 @@ static struct platform_device scif0_device = {
197195
};
198196

199197
static struct plat_sci_port scif1_platform_data = {
200-
.flags = UPF_BOOT_AUTOCONF,
201-
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |
202-
SCSCR_REIE,
198+
.scscr = SCSCR_REIE,
203199
.type = PORT_SCIF,
204200
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
205201
};
@@ -220,9 +216,7 @@ static struct platform_device scif1_device = {
220216
};
221217

222218
static struct plat_sci_port scif2_platform_data = {
223-
.flags = UPF_BOOT_AUTOCONF,
224-
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |
225-
SCSCR_REIE,
219+
.scscr = SCSCR_REIE,
226220
.type = PORT_SCIF,
227221
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
228222
};
@@ -243,9 +237,7 @@ static struct platform_device scif2_device = {
243237
};
244238

245239
static struct plat_sci_port scif3_platform_data = {
246-
.flags = UPF_BOOT_AUTOCONF,
247-
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |
248-
SCSCR_REIE,
240+
.scscr = SCSCR_REIE,
249241
.type = PORT_SCIF,
250242
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
251243
};

‎arch/sh/kernel/cpu/sh2a/setup-sh7206.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7206", vectors, groups,
134134
mask_registers, prio_registers, NULL);
135135

136136
static struct plat_sci_port scif0_platform_data = {
137-
.flags = UPF_BOOT_AUTOCONF,
138-
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
137+
.scscr = SCSCR_REIE,
139138
.type = PORT_SCIF,
140139
};
141140

@@ -155,8 +154,7 @@ static struct platform_device scif0_device = {
155154
};
156155

157156
static struct plat_sci_port scif1_platform_data = {
158-
.flags = UPF_BOOT_AUTOCONF,
159-
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
157+
.scscr = SCSCR_REIE,
160158
.type = PORT_SCIF,
161159
};
162160

@@ -176,8 +174,7 @@ static struct platform_device scif1_device = {
176174
};
177175

178176
static struct plat_sci_port scif2_platform_data = {
179-
.flags = UPF_BOOT_AUTOCONF,
180-
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
177+
.scscr = SCSCR_REIE,
181178
.type = PORT_SCIF,
182179
};
183180

@@ -197,8 +194,7 @@ static struct platform_device scif2_device = {
197194
};
198195

199196
static struct plat_sci_port scif3_platform_data = {
200-
.flags = UPF_BOOT_AUTOCONF,
201-
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
197+
.scscr = SCSCR_REIE,
202198
.type = PORT_SCIF,
203199
};
204200

0 commit comments

Comments
 (0)