diff mbox series

dt-bindings: serial: fsl-imx-uart: fix i.MX 53 and 6 compatible matching

Message ID 20200925212649.23183-1-krzk@kernel.org
State Not Applicable
Headers show
Series dt-bindings: serial: fsl-imx-uart: fix i.MX 53 and 6 compatible matching | expand

Checks

Context Check Description
robh/checkpatch warning total: 0 errors, 1 warnings, 26 lines checked

Commit Message

Krzysztof Kozlowski Sept. 25, 2020, 9:26 p.m. UTC
The i.MX 53 and i.MX6Q DTS use two compatibles, i.MX 6SL/6SLL/SX three
so update the binding to fix dtbs_check warnings like:

  serial@21ec000: compatible: ['fsl,imx6q-uart', 'fsl,imx21-uart'] is not valid under any of the given schemas

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
---
 .../devicetree/bindings/serial/fsl-imx-uart.yaml          | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

Rob Herring Sept. 28, 2020, 12:56 p.m. UTC | #1
On Fri, 25 Sep 2020 23:26:49 +0200, Krzysztof Kozlowski wrote:
> The i.MX 53 and i.MX6Q DTS use two compatibles, i.MX 6SL/6SLL/SX three
> so update the binding to fix dtbs_check warnings like:
> 
>   serial@21ec000: compatible: ['fsl,imx6q-uart', 'fsl,imx21-uart'] is not valid under any of the given schemas
> 
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
> ---
>  .../devicetree/bindings/serial/fsl-imx-uart.yaml          | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 

Acked-by: Rob Herring <robh@kernel.org>
Greg KH Oct. 2, 2020, 12:41 p.m. UTC | #2
On Fri, Sep 25, 2020 at 11:26:49PM +0200, Krzysztof Kozlowski wrote:
> The i.MX 53 and i.MX6Q DTS use two compatibles, i.MX 6SL/6SLL/SX three
> so update the binding to fix dtbs_check warnings like:
> 
>   serial@21ec000: compatible: ['fsl,imx6q-uart', 'fsl,imx21-uart'] is not valid under any of the given schemas
> 
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
> ---
>  .../devicetree/bindings/serial/fsl-imx-uart.yaml          | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)

This doesn't apply to my tty tree :(
Krzysztof Kozlowski Oct. 2, 2020, 12:45 p.m. UTC | #3
On Fri, 2 Oct 2020 at 14:41, Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
>
> On Fri, Sep 25, 2020 at 11:26:49PM +0200, Krzysztof Kozlowski wrote:
> > The i.MX 53 and i.MX6Q DTS use two compatibles, i.MX 6SL/6SLL/SX three
> > so update the binding to fix dtbs_check warnings like:
> >
> >   serial@21ec000: compatible: ['fsl,imx6q-uart', 'fsl,imx21-uart'] is not valid under any of the given schemas
> >
> > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
> > ---
> >  .../devicetree/bindings/serial/fsl-imx-uart.yaml          | 8 ++++++--
> >  1 file changed, 6 insertions(+), 2 deletions(-)
>
> This doesn't apply to my tty tree :(

It is rebased on my previous fsl-imx-uart dt-bindings patch which was
picked up by Rob. Otherwise there would be conflicts.

Rob,
Could you pick this up as well?

Best regards,
Krzysztof
Rob Herring Oct. 6, 2020, 2:50 p.m. UTC | #4
On Fri, Oct 02, 2020 at 02:45:51PM +0200, Krzysztof Kozlowski wrote:
> On Fri, 2 Oct 2020 at 14:41, Greg Kroah-Hartman
> <gregkh@linuxfoundation.org> wrote:
> >
> > On Fri, Sep 25, 2020 at 11:26:49PM +0200, Krzysztof Kozlowski wrote:
> > > The i.MX 53 and i.MX6Q DTS use two compatibles, i.MX 6SL/6SLL/SX three
> > > so update the binding to fix dtbs_check warnings like:
> > >
> > >   serial@21ec000: compatible: ['fsl,imx6q-uart', 'fsl,imx21-uart'] is not valid under any of the given schemas
> > >
> > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
> > > ---
> > >  .../devicetree/bindings/serial/fsl-imx-uart.yaml          | 8 ++++++--
> > >  1 file changed, 6 insertions(+), 2 deletions(-)
> >
> > This doesn't apply to my tty tree :(
> 
> It is rebased on my previous fsl-imx-uart dt-bindings patch which was
> picked up by Rob. Otherwise there would be conflicts.
> 
> Rob,
> Could you pick this up as well?

Applied.

Rob
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/serial/fsl-imx-uart.yaml b/Documentation/devicetree/bindings/serial/fsl-imx-uart.yaml
index 3d896173b3b0..9ff85bc6859c 100644
--- a/Documentation/devicetree/bindings/serial/fsl-imx-uart.yaml
+++ b/Documentation/devicetree/bindings/serial/fsl-imx-uart.yaml
@@ -18,8 +18,6 @@  properties:
     oneOf:
       - const: fsl,imx1-uart
       - const: fsl,imx21-uart
-      - const: fsl,imx53-uart
-      - const: fsl,imx6q-uart
       - items:
           - enum:
             - fsl,imx25-uart
@@ -28,12 +26,18 @@  properties:
             - fsl,imx35-uart
             - fsl,imx50-uart
             - fsl,imx51-uart
+            - fsl,imx53-uart
+            - fsl,imx6q-uart
           - const: fsl,imx21-uart
       - items:
           - enum:
             - fsl,imx6sl-uart
             - fsl,imx6sll-uart
             - fsl,imx6sx-uart
+          - const: fsl,imx6q-uart
+          - const: fsl,imx21-uart
+      - items:
+          - enum:
             - fsl,imx6ul-uart
             - fsl,imx7d-uart
             - fsl,imx8mm-uart