diff options
| author | Hector Martin <marcan@marcan.st> | 2021-04-08 12:17:19 +0200 |
|---|---|---|
| committer | Hector Martin <marcan@marcan.st> | 2021-04-08 12:17:33 +0200 |
| commit | fd3b2aa100fa879848ae28fd4cb6ff7bb682ae7d (patch) | |
| tree | d417b1a0b9db925fc791393bdfeee2099ef32028 /Documentation/devicetree | |
| parent | Linux 5.12-rc3 (diff) | |
| parent | dt-bindings: serial: samsung: add DMA properties (diff) | |
| download | linux-fd3b2aa100fa879848ae28fd4cb6ff7bb682ae7d.tar.xz linux-fd3b2aa100fa879848ae28fd4cb6ff7bb682ae7d.zip | |
Merge commit '71b25f4df984' from tty/tty-next
This point in gregkh's tty-next tree includes all the samsung_tty
changes that were part of v3 of the M1 bring-up series, and have
already been merged in.
Signed-off-by: Hector Martin <marcan@marcan.st>
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/serial/samsung_uart.yaml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/serial/samsung_uart.yaml b/Documentation/devicetree/bindings/serial/samsung_uart.yaml index 21ee627b2ced..4f98a3896b3a 100644 --- a/Documentation/devicetree/bindings/serial/samsung_uart.yaml +++ b/Documentation/devicetree/bindings/serial/samsung_uart.yaml @@ -4,7 +4,7 @@ $id: http://devicetree.org/schemas/serial/samsung_uart.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Samsung S3C, S5P and Exynos SoC UART Controller +title: Samsung S3C, S5P, Exynos, and S5L (Apple SoC) SoC UART Controller maintainers: - Krzysztof Kozlowski <krzk@kernel.org> @@ -19,6 +19,7 @@ properties: compatible: items: - enum: + - apple,s5l-uart - samsung,s3c2410-uart - samsung,s3c2412-uart - samsung,s3c2440-uart @@ -51,6 +52,16 @@ properties: - pattern: '^clk_uart_baud[0-3]$' - pattern: '^clk_uart_baud[0-3]$' + dmas: + items: + - description: DMA controller phandle and request line for RX + - description: DMA controller phandle and request line for TX + + dma-names: + items: + - const: rx + - const: tx + interrupts: description: RX interrupt and optionally TX interrupt. minItems: 1 @@ -96,6 +107,7 @@ allOf: compatible: contains: enum: + - apple,s5l-uart - samsung,exynos4210-uart then: properties: |