diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-01 15:33:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-01 15:33:14 +0100 |
| commit | 5b5a502d199f11d09e3059713a20f0fd3d703ce6 (patch) | |
| tree | 8433e1a551c0a532c8bd658398b6fbbf7ebe2fa4 /Documentation/devicetree | |
| parent | d7de2d589f38d3e683d956bb9cf981ba4df6a6a5 (diff) | |
| parent | bf961847813d9edcb5a9c089714069428d141fa9 (diff) | |
| download | linux-next-5b5a502d199f11d09e3059713a20f0fd3d703ce6.tar.gz linux-next-5b5a502d199f11d09e3059713a20f0fd3d703ce6.zip | |
Merge branch 'tty-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
# Conflicts:
# drivers/tty/serial/qcom_geni_serial.c
# include/linux/soc/qcom/geni-se.h
Diffstat (limited to 'Documentation/devicetree')
5 files changed, 25 insertions, 17 deletions
diff --git a/Documentation/devicetree/bindings/serial/8250.yaml b/Documentation/devicetree/bindings/serial/8250.yaml index 8c2c177faf89..50d5c977afa3 100644 --- a/Documentation/devicetree/bindings/serial/8250.yaml +++ b/Documentation/devicetree/bindings/serial/8250.yaml @@ -100,19 +100,25 @@ allOf: properties: compatible: oneOf: - - const: ns8250 - - const: ns16450 - - const: ns16550 - - const: ns16550a - - const: ns16850 - - const: aspeed,ast2400-vuart - - const: aspeed,ast2500-vuart - - const: intel,xscale-uart - - const: mrvl,pxa-uart - - const: nuvoton,wpcm450-uart - - const: nuvoton,npcm750-uart - - const: nvidia,tegra20-uart - - const: nxp,lpc3220-uart + - enum: + - ns8250 + - ns16450 + - ns16550 + - ns16550a + - ns16850 + - airoha,an7581-hsuart + - airoha,en7523-uart + - aspeed,ast2400-vuart + - aspeed,ast2500-vuart + - intel,xscale-uart + - mrvl,pxa-uart + - nuvoton,npcm750-uart + - nuvoton,wpcm450-uart + - nvidia,tegra20-uart + - nxp,lpc3220-uart + - items: + - const: airoha,an7581-uart + - const: airoha,en7523-uart - items: - enum: - exar,xr16l2552 diff --git a/Documentation/devicetree/bindings/serial/cdns,uart.yaml b/Documentation/devicetree/bindings/serial/cdns,uart.yaml index 9d3e5c1d8502..11292de42c67 100644 --- a/Documentation/devicetree/bindings/serial/cdns,uart.yaml +++ b/Documentation/devicetree/bindings/serial/cdns,uart.yaml @@ -19,6 +19,7 @@ properties: - items: - enum: - axiado,ax3000-uart + - axiado,ax3005-uart - xlnx,zynqmp-uart - const: cdns,uart-r1p12 diff --git a/Documentation/devicetree/bindings/serial/renesas,hscif.yaml b/Documentation/devicetree/bindings/serial/renesas,hscif.yaml index 4b3f98a46cd9..409cab32de3d 100644 --- a/Documentation/devicetree/bindings/serial/renesas,hscif.yaml +++ b/Documentation/devicetree/bindings/serial/renesas,hscif.yaml @@ -97,14 +97,14 @@ properties: dmas: minItems: 2 - maxItems: 4 + maxItems: 6 description: Must contain a list of pairs of references to DMA specifiers, one for transmission, and one for reception. dma-names: minItems: 2 - maxItems: 4 + maxItems: 6 items: enum: - tx diff --git a/Documentation/devicetree/bindings/serial/renesas,scif.yaml b/Documentation/devicetree/bindings/serial/renesas,scif.yaml index 82f54446835e..b465c93c8357 100644 --- a/Documentation/devicetree/bindings/serial/renesas,scif.yaml +++ b/Documentation/devicetree/bindings/serial/renesas,scif.yaml @@ -145,14 +145,14 @@ properties: dmas: minItems: 2 - maxItems: 4 + maxItems: 6 description: Must contain a list of pairs of references to DMA specifiers, one for transmission, and one for reception. dma-names: minItems: 2 - maxItems: 4 + maxItems: 6 items: enum: - tx diff --git a/Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml b/Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml index 664305de4986..86dc25919311 100644 --- a/Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml +++ b/Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml @@ -80,6 +80,7 @@ properties: - starfive,jh7100-hsuart - starfive,jh7100-uart - starfive,jh7110-uart + - ti,tda54-uart - ultrarisc,dp1000-uart - const: snps,dw-apb-uart - const: snps,dw-apb-uart |