Skip to content

Commit 607ca0f

Browse files
committed
Merge tag 'tty-6.0-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 and serial driver changes for 6.0-rc1. It was delayed from last week as I wanted to make sure the last commit here got some good testing in linux-next and elsewhere as it seemed to show up only late in testing for some reason. Nothing major here, just lots of cleanups from Jiri and Ilpo to make the tty core cleaner (Jiri) and the rs485 code simpler to use (Ilpo). Also included in here is the obligatory n_gsm updates from Daniel Starke and lots of tiny driver updates and minor fixes and tweaks for other smaller serial drivers. All of these have been in linux-next for a while with no reported problems" * tag 'tty-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (186 commits) tty: serial: qcom-geni-serial: Fix %lu -> %u in print statements tty: amiserial: Fix comment typo tty: serial: document uart_get_console() tty: serial: serial_core, reformat kernel-doc for functions Documentation: serial: link uart_ops properly Documentation: serial: move GPIO kernel-doc to the functions Documentation: serial: dedup kernel-doc for uart functions Documentation: serial: move uart_ops documentation to the struct dt-bindings: serial: snps-dw-apb-uart: Document Rockchip RV1126 serial: mvebu-uart: uart2 error bits clearing tty: serial: fsl_lpuart: correct the count of break characters serial: stm32: make info structs static to avoid sparse warnings serial: fsl_lpuart: zero out parity bit in CS7 mode tty: serial: qcom-geni-serial: Fix get_clk_div_rate() which otherwise could return a sub-optimal clock rate. serial: 8250_bcm2835aux: Add missing clk_disable_unprepare() tty: vt: initialize unicode screen buffer serial: remove VR41XX serial driver serial: 8250: lpc18xx: Remove redundant sanity check for RS485 flags serial: 8250_dwlib: remove redundant sanity check for RS485 flags dt_bindings: rs485: Correct delay values ...
2 parents 1daf117 + 0fec518 commit 607ca0f

97 files changed

Lines changed: 3353 additions & 3197 deletions

Some content is hidden

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

Documentation/devicetree/bindings/serial/8250.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ properties:
6262
- const: mrvl,pxa-uart
6363
- const: nuvoton,wpcm450-uart
6464
- const: nuvoton,npcm750-uart
65+
- const: nuvoton,npcm845-uart
6566
- const: nvidia,tegra20-uart
6667
- const: nxp,lpc3220-uart
6768
- items:
Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/serial/mediatek,uart.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: MediaTek Universal Asynchronous Receiver/Transmitter (UART)
8+
9+
maintainers:
10+
- Matthias Brugger <matthias.bgg@gmail.com>
11+
12+
allOf:
13+
- $ref: serial.yaml#
14+
15+
description: |
16+
The MediaTek UART is based on the basic 8250 UART and compatible
17+
with 16550A, with enhancements for high speed baud rates and
18+
support for DMA.
19+
20+
properties:
21+
compatible:
22+
oneOf:
23+
- const: mediatek,mt6577-uart
24+
- items:
25+
- enum:
26+
- mediatek,mt2701-uart
27+
- mediatek,mt2712-uart
28+
- mediatek,mt6580-uart
29+
- mediatek,mt6582-uart
30+
- mediatek,mt6589-uart
31+
- mediatek,mt6755-uart
32+
- mediatek,mt6765-uart
33+
- mediatek,mt6779-uart
34+
- mediatek,mt6795-uart
35+
- mediatek,mt6797-uart
36+
- mediatek,mt7622-uart
37+
- mediatek,mt7623-uart
38+
- mediatek,mt7629-uart
39+
- mediatek,mt7986-uart
40+
- mediatek,mt8127-uart
41+
- mediatek,mt8135-uart
42+
- mediatek,mt8173-uart
43+
- mediatek,mt8183-uart
44+
- mediatek,mt8186-uart
45+
- mediatek,mt8192-uart
46+
- mediatek,mt8195-uart
47+
- mediatek,mt8516-uart
48+
- const: mediatek,mt6577-uart
49+
50+
reg:
51+
description: The base address of the UART register bank
52+
maxItems: 1
53+
54+
clocks:
55+
minItems: 1
56+
items:
57+
- description: The clock the baudrate is derived from
58+
- description: The bus clock for register accesses
59+
60+
clock-names:
61+
minItems: 1
62+
items:
63+
- const: baud
64+
- const: bus
65+
66+
dmas:
67+
items:
68+
- description: phandle to TX DMA
69+
- description: phandle to RX DMA
70+
71+
dma-names:
72+
items:
73+
- const: tx
74+
- const: rx
75+
76+
interrupts:
77+
minItems: 1
78+
maxItems: 2
79+
80+
interrupt-names:
81+
description:
82+
The UART interrupt and optionally the RX in-band wakeup interrupt.
83+
minItems: 1
84+
items:
85+
- const: uart
86+
- const: wakeup
87+
88+
pinctrl-0: true
89+
pinctrl-1: true
90+
91+
pinctrl-names:
92+
minItems: 1
93+
items:
94+
- const: default
95+
- const: sleep
96+
97+
required:
98+
- compatible
99+
- reg
100+
- clocks
101+
- interrupts
102+
103+
unevaluatedProperties: false
104+
105+
examples:
106+
- |
107+
#include <dt-bindings/interrupt-controller/arm-gic.h>
108+
109+
serial@11006000 {
110+
compatible = "mediatek,mt6589-uart", "mediatek,mt6577-uart";
111+
reg = <0x11006000 0x400>;
112+
interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_LOW>,
113+
<GIC_SPI 52 IRQ_TYPE_EDGE_FALLING>;
114+
interrupt-names = "uart", "wakeup";
115+
clocks = <&uart_clk>, <&bus_clk>;
116+
clock-names = "baud", "bus";
117+
pinctrl-0 = <&uart_pin>;
118+
pinctrl-1 = <&uart_pin_sleep>;
119+
pinctrl-names = "default", "sleep";
120+
};

Documentation/devicetree/bindings/serial/mtk-uart.txt

Lines changed: 0 additions & 59 deletions
This file was deleted.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ properties:
5757
- items:
5858
- enum:
5959
- renesas,hscif-r8a779a0 # R-Car V3U
60+
- renesas,hscif-r8a779f0 # R-Car S4-8
6061
- renesas,hscif-r8a779g0 # R-Car V4H
6162
- const: renesas,rcar-gen4-hscif # R-Car Gen4
6263
- const: renesas,hscif # generic HSCIF compatible UART

Documentation/devicetree/bindings/serial/rs485.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ properties:
2222
- description: Delay between rts signal and beginning of data sent in
2323
milliseconds. It corresponds to the delay before sending data.
2424
default: 0
25-
maximum: 1000
25+
maximum: 100
2626
- description: Delay between end of data sent and rts signal in milliseconds.
2727
It corresponds to the delay after sending data and actual release
2828
of the line.
2929
default: 0
30-
maximum: 1000
30+
maximum: 100
3131

3232
rs485-rts-active-low:
3333
description: drive RTS low when sending (default is high).

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ properties:
3333
- rockchip,rk3368-uart
3434
- rockchip,rk3399-uart
3535
- rockchip,rk3568-uart
36+
- rockchip,rk3588-uart
3637
- rockchip,rv1108-uart
38+
- rockchip,rv1126-uart
3739
- const: snps,dw-apb-uart
3840
- items:
3941
- enum:

0 commit comments

Comments
 (0)