[v2,2/2] dt-bindings: serial: Move renesas,rzn1-uart into the snps-dw-apb-uart binding

Message ID 20190114172930.7508-2-robh@kernel.org
State New
Headers show
Series
  • Untitled series #17812
Related show

Commit Message

Rob Herring Jan. 14, 2019, 5:29 p.m.
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>

---
v2:
- Move Renesas compatible strings to this patch

 .../devicetree/bindings/serial/renesas,rzn1-uart.txt   | 10 ----------
 .../devicetree/bindings/serial/snps-dw-apb-uart.yaml   |  5 +++++
 2 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/serial/renesas,rzn1-uart.txt

-- 
2.19.1

Comments

Geert Uytterhoeven Oct. 25, 2019, 12:56 p.m. | #1
Hi Rob,

On Mon, Jan 14, 2019 at 6:30 PM Rob Herring <robh@kernel.org> wrote:
> 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>


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

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

> @@ -15,6 +15,11 @@ allOf:

>  properties:

>    compatible:

>      oneOf:

> +      - items:

> +          - enum:

> +              - renesas,r9a06g032-uart

> +              - renesas,r9a06g033-uart

> +          - const: renesas,rzn1-uart

>        - items:

>            - enum:

>                - rockchip,px30-uart


With ARCH=arm and shmobile_defconfig, "make dtbs_check
DT_SCHEMA_FILES=Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml"
complains:

arch/arm/boot/dts/r9a06g032-rzn1d400-db.dt.yaml: compatible:
['renesas,r9a06g032-uart', 'renesas,rzn1-uart', 'snps,dw-apb-uart'] is
not valid under any of the given schemas
arch/arm/boot/dts/r9a06g032-rzn1d400-db.dt.yaml: compatible:
['renesas,r9a06g032-uart', 'renesas,rzn1-uart', 'snps,dw-apb-uart'] is
not valid under any of the given schemas
arch/arm/boot/dts/r9a06g032-rzn1d400-db.dt.yaml: compatible:
['renesas,r9a06g032-uart', 'renesas,rzn1-uart', 'snps,dw-apb-uart'] is
not valid under any of the given schemas

Do you know what's wrong?
Thanks!

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Patch

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
@@ -15,6 +15,11 @@  allOf:
 properties:
   compatible:
     oneOf:
+      - items:
+          - enum:
+              - renesas,r9a06g032-uart
+              - renesas,r9a06g033-uart
+          - const: renesas,rzn1-uart
       - items:
           - enum:
               - rockchip,px30-uart