Skip to content

Commit bd736f3

Browse files
committed
Merge tag 'tty-6.8-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 and serial driver changes for 6.8-rc1. As usual, Jiri has a bunch of refactoring and cleanups for the tty core and drivers in here, along with the usual set of rs485 updates (someday this might work properly...) Along with those, in here are changes for: - sc16is7xx serial driver updates - platform driver removal api updates - amba-pl011 driver updates - tty driver binding updates - other small tty/serial driver updates and changes All of these have been in linux-next for a while with no reported issues" * tag 'tty-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (197 commits) serial: sc16is7xx: refactor EFR lock serial: sc16is7xx: reorder code to remove prototype declarations serial: sc16is7xx: refactor FIFO access functions to increase commonality serial: sc16is7xx: drop unneeded MODULE_ALIAS serial: sc16is7xx: replace hardcoded divisor value with BIT() macro serial: sc16is7xx: add explicit return for some switch default cases serial: sc16is7xx: add macro for max number of UART ports serial: sc16is7xx: add driver name to struct uart_driver serial: sc16is7xx: use i2c_get_match_data() serial: sc16is7xx: use spi_get_device_match_data() serial: sc16is7xx: use DECLARE_BITMAP for sc16is7xx_lines bitfield serial: sc16is7xx: improve do/while loop in sc16is7xx_irq() serial: sc16is7xx: remove obsolete loop in sc16is7xx_port_irq() serial: sc16is7xx: set safe default SPI clock frequency serial: sc16is7xx: add check for unsupported SPI modes during probe serial: sc16is7xx: fix invalid sc16is7xx_lines bitfield in case of probe error serial: 8250_exar: Set missing rs485_supported flag serial: omap: do not override settings for RS485 support serial: core, imx: do not set RS485 enabled if it is not supported serial: core: make sure RS485 cannot be enabled when it is not supported ...
2 parents e38f734 + 0c84bea commit bd736f3

File tree

172 files changed

+1673
-1568
lines changed

Some content is hidden

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

172 files changed

+1673
-1568
lines changed

Documentation/admin-guide/devices.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2704,6 +2704,9 @@
27042704
...
27052705
185 = /dev/ttyNX15 Hilscher netX serial port 15
27062706
186 = /dev/ttyJ0 JTAG1 DCC protocol based serial port emulation
2707+
2708+
If maximum number of uartlite serial ports is more than 4, then the driver
2709+
uses dynamic allocation instead of static allocation for major number.
27072710
187 = /dev/ttyUL0 Xilinx uartlite - port 0
27082711
...
27092712
190 = /dev/ttyUL3 Xilinx uartlite - port 3

Documentation/admin-guide/sysrq.rst

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,19 @@ On other
7575
submit a patch to be included in this section.
7676

7777
On all
78-
Write a character to /proc/sysrq-trigger. e.g.::
78+
Write a single character to /proc/sysrq-trigger.
79+
Only the first character is processed, the rest of the string is
80+
ignored. However, it is not recommended to write any extra characters
81+
as the behavior is undefined and might change in the future versions.
82+
E.g.::
7983

8084
echo t > /proc/sysrq-trigger
8185

86+
Alternatively, write multiple characters prepended by underscore.
87+
This way, all characters will be processed. E.g.::
88+
89+
echo _reisub > /proc/sysrq-trigger
90+
8291
The :kbd:`<command key>` is case sensitive.
8392

8493
What are the 'command' keys?
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/serial/arm,dcc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: ARM DCC (Data communication channel) serial emulation
8+
9+
maintainers:
10+
- Michal Simek <michal.simek@amd.com>
11+
12+
description: |
13+
ARM DCC (Data communication channel) serial emulation interface available
14+
via JTAG can be also used as one of serial line tightly coupled with every
15+
ARM CPU available in the system.
16+
17+
properties:
18+
compatible:
19+
const: arm,dcc
20+
21+
required:
22+
- compatible
23+
24+
additionalProperties: false
25+
26+
examples:
27+
- |
28+
serial {
29+
compatible = "arm,dcc";
30+
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ description: |
1313
https://www.nxp.com/webapp/Download?colCode=S32V234RM.
1414
1515
maintainers:
16-
- Chester Lin <clin@suse.com>
16+
- Chester Lin <chester62515@gmail.com>
1717

1818
allOf:
1919
- $ref: serial.yaml#

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

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ title: Freescale i.MX Universal Asynchronous Receiver/Transmitter (UART)
99
maintainers:
1010
- Fabio Estevam <festevam@gmail.com>
1111

12-
allOf:
13-
- $ref: serial.yaml#
14-
- $ref: rs485.yaml#
15-
1612
properties:
1713
compatible:
1814
oneOf:
@@ -68,7 +64,11 @@ properties:
6864
- const: tx
6965

7066
interrupts:
71-
maxItems: 1
67+
items:
68+
- description: UART RX Interrupt
69+
- description: UART TX Interrupt
70+
- description: UART RTS Interrupt
71+
minItems: 1
7272

7373
wakeup-source: true
7474

@@ -110,6 +110,25 @@ required:
110110
- clock-names
111111
- interrupts
112112

113+
allOf:
114+
- $ref: serial.yaml#
115+
- $ref: rs485.yaml#
116+
117+
- if:
118+
properties:
119+
compatible:
120+
contains:
121+
const: fsl,imx1-uart
122+
then:
123+
properties:
124+
interrupts:
125+
minItems: 3
126+
maxItems: 3
127+
else:
128+
properties:
129+
interrupts:
130+
maxItems: 1
131+
113132
unevaluatedProperties: false
114133

115134
examples:

Documentation/devicetree/bindings/serial/qcom,msm-uartdm.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,17 @@ properties:
4848
- const: tx
4949
- const: rx
5050

51+
interconnects:
52+
maxItems: 1
53+
5154
interrupts:
5255
maxItems: 1
5356

57+
operating-points-v2: true
58+
59+
power-domains:
60+
maxItems: 1
61+
5462
qcom,rx-crci:
5563
$ref: /schemas/types.yaml#/definitions/uint32
5664
description:
@@ -99,7 +107,9 @@ unevaluatedProperties: false
99107

100108
examples:
101109
- |
110+
#include <dt-bindings/interconnect/qcom,msm8996.h>
102111
#include <dt-bindings/interrupt-controller/arm-gic.h>
112+
#include <dt-bindings/power/qcom-rpmpd.h>
103113
104114
serial@f991e000 {
105115
compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
@@ -109,4 +119,7 @@ examples:
109119
clock-names = "core", "iface";
110120
dmas = <&dma0 0>, <&dma0 1>;
111121
dma-names = "tx", "rx";
122+
power-domains = <&rpmpd MSM8996_VDDCX>;
123+
operating-points-v2 = <&uart_opp_table>;
124+
interconnects = <&pnoc MASTER_BLSP_1 &bimc SLAVE_EBI_CH0>;
112125
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ properties:
1717
oneOf:
1818
- items:
1919
- enum:
20-
- renesas,r9a07g043-sci # RZ/G2UL
20+
- renesas,r9a07g043-sci # RZ/G2UL and RZ/Five
2121
- renesas,r9a07g044-sci # RZ/G2{L,LC}
2222
- renesas,r9a07g054-sci # RZ/V2L
2323
- const: renesas,sci # generic SCI compatible UART

Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ maintainers:
1111

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

1516
properties:
1617
compatible:

Documentation/devicetree/bindings/serial/sprd-uart.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ properties:
2020
- sprd,sc9860-uart
2121
- sprd,sc9863a-uart
2222
- sprd,ums512-uart
23+
- sprd,ums9620-uart
2324
- const: sprd,sc9836-uart
2425
- const: sprd,sc9836-uart
2526

MAINTAINERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23185,7 +23185,6 @@ M: Amit Shah <amit@kernel.org>
2318523185
L: virtualization@lists.linux.dev
2318623186
S: Maintained
2318723187
F: drivers/char/virtio_console.c
23188-
F: include/linux/virtio_console.h
2318923188
F: include/uapi/linux/virtio_console.h
2319023189

2319123190
VIRTIO CORE AND NET DRIVERS

0 commit comments

Comments
 (0)