-
Notifications
You must be signed in to change notification settings - Fork 59
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'tty-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel…
…/git/gregkh/tty Pull tty / serial updates from Greg KH: "Here is a small set of tty and serial driver updates for 6.11-rc1. Not much happened this cycle, unlike the previous kernel release which had lots of "excitement" in this part of the kernel. Included in here are the following changes: - dt binding updates for new platforms - 8250 driver updates - various small serial driver fixes and updates - printk/console naming and matching attempt #2 (was reverted for 6.10-final, should be good to go this time around, acked by the relevant maintainers). All of these have been in linux-next for a while with no reported issues" * tag 'tty-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (22 commits) Documentation: kernel-parameters: Add DEVNAME:0.0 format for serial ports serial: core: Add serial_base_match_and_update_preferred_console() printk: Add match_devname_and_update_preferred_console() serial: sc16is7xx: hardware reset chip if reset-gpios is defined in DT dt-bindings: serial: sc16is7xx: add reset-gpios dt-bindings: serial: vt8500-uart: convert to json-schema serial: 8250_platform: Explicitly show we initialise ISA ports only once tty: add missing MODULE_DESCRIPTION() macros dt-bindings: serial: mediatek,uart: add MT7988 serial: sh-sci: Add support for RZ/V2H(P) SoC dt-bindings: serial: Add documentation for Renesas RZ/V2H(P) (R9A09G057) SCIF support dt-bindings: serial: renesas,scif: Make 'interrupt-names' property as required dt-bindings: serial: renesas,scif: Validate 'interrupts' and 'interrupt-names' dt-bindings: serial: renesas,scif: Move ref for serial.yaml at the end riscv: dts: starfive: jh7110: Add the core reset and jh7110 compatible for uarts serial: 8250_dw: Use reset array API to get resets dt-bindings: serial: snps-dw-apb-uart: Add one more reset signal for StarFive JH7110 SoC serial: 8250: Extract platform driver serial: 8250: Extract RSA bits serial: imx: stop casting struct uart_port to struct imx_port ...
- Loading branch information
Showing
41 changed files
with
1,000 additions
and
598 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,9 +9,6 @@ title: Renesas Serial Communication Interface with FIFO (SCIF) | |
maintainers: | ||
- Geert Uytterhoeven <[email protected]> | ||
|
||
allOf: | ||
- $ref: serial.yaml# | ||
|
||
properties: | ||
compatible: | ||
oneOf: | ||
|
@@ -83,40 +80,39 @@ properties: | |
- renesas,scif-r9a08g045 # RZ/G3S | ||
- const: renesas,scif-r9a07g044 # RZ/G2{L,LC} fallback | ||
|
||
- const: renesas,scif-r9a09g057 # RZ/V2H(P) | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
interrupts: | ||
oneOf: | ||
- items: | ||
- description: A combined interrupt | ||
- items: | ||
- description: Error interrupt | ||
- description: Receive buffer full interrupt | ||
- description: Transmit buffer empty interrupt | ||
- description: Break interrupt | ||
- items: | ||
- description: Error interrupt | ||
- description: Receive buffer full interrupt | ||
- description: Transmit buffer empty interrupt | ||
- description: Break interrupt | ||
- description: Data Ready interrupt | ||
- description: Transmit End interrupt | ||
- description: Transmit End/Data Ready interrupt | ||
- description: Receive buffer full interrupt (EDGE trigger) | ||
- description: Transmit buffer empty interrupt (EDGE trigger) | ||
minItems: 4 | ||
|
||
interrupt-names: | ||
oneOf: | ||
- items: | ||
- const: eri | ||
- const: rxi | ||
- const: txi | ||
- const: bri | ||
- items: | ||
- const: eri | ||
- const: rxi | ||
- const: txi | ||
- const: bri | ||
- const: dri | ||
- const: tei | ||
minItems: 4 | ||
items: | ||
- const: eri | ||
- const: rxi | ||
- const: txi | ||
- const: bri | ||
- const: dri | ||
- const: tei | ||
- const: tei-dri | ||
- const: rxi-edge | ||
- const: txi-edge | ||
|
||
clocks: | ||
minItems: 1 | ||
|
@@ -161,18 +157,92 @@ required: | |
- clock-names | ||
- power-domains | ||
|
||
if: | ||
properties: | ||
compatible: | ||
contains: | ||
enum: | ||
- renesas,rcar-gen2-scif | ||
- renesas,rcar-gen3-scif | ||
- renesas,rcar-gen4-scif | ||
- renesas,scif-r9a07g044 | ||
then: | ||
required: | ||
- resets | ||
allOf: | ||
- $ref: serial.yaml# | ||
|
||
- if: | ||
properties: | ||
compatible: | ||
contains: | ||
enum: | ||
- renesas,rcar-gen2-scif | ||
- renesas,rcar-gen3-scif | ||
- renesas,rcar-gen4-scif | ||
- renesas,scif-r9a07g044 | ||
- renesas,scif-r9a09g057 | ||
then: | ||
required: | ||
- resets | ||
|
||
- if: | ||
properties: | ||
compatible: | ||
contains: | ||
enum: | ||
- renesas,rcar-gen1-scif | ||
- renesas,rcar-gen2-scif | ||
- renesas,rcar-gen3-scif | ||
- renesas,rcar-gen4-scif | ||
then: | ||
properties: | ||
interrupts: | ||
maxItems: 1 | ||
|
||
interrupt-names: false | ||
else: | ||
required: | ||
- interrupt-names | ||
|
||
- if: | ||
properties: | ||
compatible: | ||
contains: | ||
enum: | ||
- renesas,scif-r7s72100 | ||
then: | ||
properties: | ||
interrupts: | ||
minItems: 4 | ||
maxItems: 4 | ||
|
||
interrupt-names: | ||
maxItems: 4 | ||
|
||
- if: | ||
properties: | ||
compatible: | ||
contains: | ||
enum: | ||
- renesas,scif-r7s9210 | ||
- renesas,scif-r9a07g044 | ||
then: | ||
properties: | ||
interrupts: | ||
minItems: 6 | ||
maxItems: 6 | ||
|
||
interrupt-names: | ||
minItems: 6 | ||
maxItems: 6 | ||
|
||
- if: | ||
properties: | ||
compatible: | ||
contains: | ||
const: renesas,scif-r9a09g057 | ||
then: | ||
properties: | ||
clocks: | ||
maxItems: 1 | ||
|
||
clock-names: | ||
maxItems: 1 | ||
|
||
interrupts: | ||
minItems: 9 | ||
|
||
interrupt-names: | ||
minItems: 9 | ||
|
||
unevaluatedProperties: false | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
Documentation/devicetree/bindings/serial/via,vt8500-uart.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
|
||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/serial/via,vt8500-uart.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: VIA VT8500 and WonderMedia WM8xxx UART Controller | ||
|
||
maintainers: | ||
- Alexey Charkov <[email protected]> | ||
|
||
allOf: | ||
- $ref: serial.yaml | ||
|
||
properties: | ||
compatible: | ||
enum: | ||
- via,vt8500-uart # up to WM8850/WM8950 | ||
- wm,wm8880-uart # for WM8880 and later | ||
|
||
clocks: | ||
maxItems: 1 | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
required: | ||
- compatible | ||
- clocks | ||
- interrupts | ||
- reg | ||
|
||
unevaluatedProperties: false | ||
|
||
examples: | ||
- | | ||
serial@d8200000 { | ||
compatible = "via,vt8500-uart"; | ||
reg = <0xd8200000 0x1040>; | ||
interrupts = <32>; | ||
clocks = <&clkuart0>; | ||
}; |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.