diff options
| author |   Rob Herring <robh@kernel.org> | 2019-01-14 11:29:30 -0600 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-18 11:12:17 +0100 |
| commit | 896efccfcc7ff9cca44baa916a55ddf323cc10d1 (patch) | |
| tree | 177b2b7df7bfe3ea26081dd8b7e1ff5827104d8d | |
| parent | dt-bindings: serial: Convert snps,dw-apb-uart to json-schema (diff) | |
| download | linux-dev-896efccfcc7ff9cca44baa916a55ddf323cc10d1.tar.xz linux-dev-896efccfcc7ff9cca44baa916a55ddf323cc10d1.zip | |
dt-bindings: serial: Move renesas,rzn1-uart into the snps-dw-apb-uart binding
The renesas,rzn1-uart binding only differs in compatible string from the
snps-dw-apb-uart binding. Move it there, converting it to json-schema in
the process.
Cc: Phil Edworthy <phil.edworthy@renesas.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-serial@vger.kernel.org
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | Documentation/devicetree/bindings/serial/renesas,rzn1-uart.txt | 10 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml | 5 |
2 files changed, 5 insertions, 10 deletions
diff --git a/Documentation/devicetree/bindings/serial/renesas,rzn1-uart.txt b/Documentation/devicetree/bindings/serial/renesas,rzn1-uart.txt deleted file mode 100644 index 8b9e0d4dc2e4..000000000000 --- a/Documentation/devicetree/bindings/serial/renesas,rzn1-uart.txt +++ /dev/null @@ -1,10 +0,0 @@ -Renesas RZ/N1 UART - -This controller is based on the Synopsys DesignWare ABP UART and inherits all -properties defined in snps-dw-apb-uart.txt except for the compatible property. - -Required properties: -- compatible : The device specific string followed by the generic RZ/N1 string. - Therefore it must be one of: - "renesas,r9a06g032-uart", "renesas,rzn1-uart" - "renesas,r9a06g033-uart", "renesas,rzn1-uart" diff --git a/Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml b/Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml index 3e90c790d720..b42002542690 100644 --- a/Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml +++ b/Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml @@ -17,6 +17,11 @@ properties: oneOf: - items: - enum: + - renesas,r9a06g032-uart + - renesas,r9a06g033-uart + - const: renesas,rzn1-uart + - items: + - enum: - rockchip,px30-uart - rockchip,rk3036-uart - rockchip,rk3066-uart |