[v2,2/2] 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>
---
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

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

On Fri, Oct 25, 2019 at 7:56 AM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>
> 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?

The addition doesn't allow for "snps,dw-apb-uart". Guess I relied on
the binding doc being accurate. So we need to either drop it from dts
files if the generic compatible is never useful (maybe simple cases
like earlycon?) or add it here.

Rob