diff mbox series

[v3,09/11] dt-bindings: i2c: i2c-imx-lpi2c: Fix dtbs_check compatible oneOf error

Message ID 1633526764-30151-10-git-send-email-abel.vesa@nxp.com (mailing list archive)
State New, archived
Headers show
Series arm64: dts: Add i.MX8DXL initial support | expand

Commit Message

Abel Vesa Oct. 6, 2021, 1:26 p.m. UTC
Fix following dtbs_check error:

arch/arm64/boot/dts/freescale/imx8qm-mek.dt.yaml:
i2c@5a800000: compatible: 'oneOf' conditional failed, one must be fixed:
        ['fsl,imx8qm-lpi2c', 'fsl,imx7ulp-lpi2c'] is too long
        Additional items are not allowed ('fsl,imx7ulp-lpi2c' was
unexpected)
        'fsl,imx8qxp-lpi2c' was expected
        From schema:
Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml

Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
---
 Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Rob Herring Oct. 14, 2021, 8:02 p.m. UTC | #1
On Wed, Oct 06, 2021 at 04:26:02PM +0300, Abel Vesa wrote:
> Fix following dtbs_check error:
> 
> arch/arm64/boot/dts/freescale/imx8qm-mek.dt.yaml:
> i2c@5a800000: compatible: 'oneOf' conditional failed, one must be fixed:
>         ['fsl,imx8qm-lpi2c', 'fsl,imx7ulp-lpi2c'] is too long
>         Additional items are not allowed ('fsl,imx7ulp-lpi2c' was
> unexpected)
>         'fsl,imx8qxp-lpi2c' was expected
>         From schema:
> Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
> 
> Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
> ---
>  Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml b/Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
> index 29b9447f3b84..acf2d5f45f4e 100644
> --- a/Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
> +++ b/Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
> @@ -18,8 +18,11 @@ properties:
>        - enum:
>            - fsl,imx7ulp-lpi2c
>            - fsl,imx8qm-lpi2c
> +          - fsl,imx8qxp-lpi2c

Both with and without a fallback should not be valid.

Why are you changing fsl,imx8qxp-lpi2c when the error was for 
fsl,imx8qm-lpi2c?

>        - items:
> -          - const: fsl,imx8qxp-lpi2c
> +          - enum:
> +              - fsl,imx8qm-lpi2c
> +              - fsl,imx8qxp-lpi2c
>            - const: fsl,imx7ulp-lpi2c
>  
>    reg:
> -- 
> 2.31.1
> 
>
Abel Vesa Nov. 10, 2021, 3:52 p.m. UTC | #2
On 21-10-14 15:02:19, Rob Herring wrote:
> On Wed, Oct 06, 2021 at 04:26:02PM +0300, Abel Vesa wrote:
> > Fix following dtbs_check error:
> > 
> > arch/arm64/boot/dts/freescale/imx8qm-mek.dt.yaml:
> > i2c@5a800000: compatible: 'oneOf' conditional failed, one must be fixed:
> >         ['fsl,imx8qm-lpi2c', 'fsl,imx7ulp-lpi2c'] is too long
> >         Additional items are not allowed ('fsl,imx7ulp-lpi2c' was
> > unexpected)
> >         'fsl,imx8qxp-lpi2c' was expected
> >         From schema:
> > Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
> > 
> > Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
> > ---
> >  Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> > 
> > diff --git a/Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml b/Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
> > index 29b9447f3b84..acf2d5f45f4e 100644
> > --- a/Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
> > +++ b/Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
> > @@ -18,8 +18,11 @@ properties:
> >        - enum:
> >            - fsl,imx7ulp-lpi2c
> >            - fsl,imx8qm-lpi2c
> > +          - fsl,imx8qxp-lpi2c
> 
> Both with and without a fallback should not be valid.
> 
> Why are you changing fsl,imx8qxp-lpi2c when the error was for 
> fsl,imx8qm-lpi2c?
> 

Sorry for the late reply.

I assume the correct way would be like:

    oneOf:                                   
      - enum:                                
          - fsl,imx7ulp-lpi2c                
      - items:                               
	  - enum:                            
	      - fsl,imx8dxl-lpi2c            
	      - fsl,imx8qxp-lpi2c            
	      - fsl,imx8qm-lpi2c             
	  - const: fsl,imx7ulp-lpi2c         
				
Right ?

Since all the possible combinations are:
	compatible = "fsl,imx8dxl-lpi2c", "fsl,imx7ulp-lpi2c";
	compatible = "fsl,imx8qm-lpi2c", "fsl,imx7ulp-lpi2c";
	compatible = "fsl,imx8qxp-lpi2c", "fsl,imx7ulp-lpi2c";
	compatible = "fsl,imx7ulp-lpi2c";


> >        - items:
> > -          - const: fsl,imx8qxp-lpi2c
> > +          - enum:
> > +              - fsl,imx8qm-lpi2c
> > +              - fsl,imx8qxp-lpi2c
> >            - const: fsl,imx7ulp-lpi2c
> >  
> >    reg:
> > -- 
> > 2.31.1
> > 
> >
Abel Vesa Nov. 10, 2021, 5:47 p.m. UTC | #3
On 21-11-10 17:52:19, Abel Vesa wrote:
> On 21-10-14 15:02:19, Rob Herring wrote:
> > On Wed, Oct 06, 2021 at 04:26:02PM +0300, Abel Vesa wrote:
> > > Fix following dtbs_check error:
> > > 
> > > arch/arm64/boot/dts/freescale/imx8qm-mek.dt.yaml:
> > > i2c@5a800000: compatible: 'oneOf' conditional failed, one must be fixed:
> > >         ['fsl,imx8qm-lpi2c', 'fsl,imx7ulp-lpi2c'] is too long
> > >         Additional items are not allowed ('fsl,imx7ulp-lpi2c' was
> > > unexpected)
> > >         'fsl,imx8qxp-lpi2c' was expected
> > >         From schema:
> > > Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
> > > 
> > > Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
> > > ---
> > >  Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml | 5 ++++-
> > >  1 file changed, 4 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml b/Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
> > > index 29b9447f3b84..acf2d5f45f4e 100644
> > > --- a/Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
> > > +++ b/Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
> > > @@ -18,8 +18,11 @@ properties:
> > >        - enum:
> > >            - fsl,imx7ulp-lpi2c
> > >            - fsl,imx8qm-lpi2c
> > > +          - fsl,imx8qxp-lpi2c
> > 
> > Both with and without a fallback should not be valid.
> > 
> > Why are you changing fsl,imx8qxp-lpi2c when the error was for 
> > fsl,imx8qm-lpi2c?
> > 
> 
> Sorry for the late reply.
> 
> I assume the correct way would be like:
> 
>     oneOf:                                   
>       - enum:                                
>           - fsl,imx7ulp-lpi2c                
>       - items:                               
> 	  - enum:                            
> 	      - fsl,imx8dxl-lpi2c            
> 	      - fsl,imx8qxp-lpi2c            
> 	      - fsl,imx8qm-lpi2c             
> 	  - const: fsl,imx7ulp-lpi2c         
> 				
> Right ?
> 
> Since all the possible combinations are:
> 	compatible = "fsl,imx8dxl-lpi2c", "fsl,imx7ulp-lpi2c";
> 	compatible = "fsl,imx8qm-lpi2c", "fsl,imx7ulp-lpi2c";
> 	compatible = "fsl,imx8qxp-lpi2c", "fsl,imx7ulp-lpi2c";
> 	compatible = "fsl,imx7ulp-lpi2c";
> 

Sent v4. Please have a look there.

> 
> > >        - items:
> > > -          - const: fsl,imx8qxp-lpi2c
> > > +          - enum:
> > > +              - fsl,imx8qm-lpi2c
> > > +              - fsl,imx8qxp-lpi2c
> > >            - const: fsl,imx7ulp-lpi2c
> > >  
> > >    reg:
> > > -- 
> > > 2.31.1
> > > 
> > >
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml b/Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
index 29b9447f3b84..acf2d5f45f4e 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
+++ b/Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
@@ -18,8 +18,11 @@  properties:
       - enum:
           - fsl,imx7ulp-lpi2c
           - fsl,imx8qm-lpi2c
+          - fsl,imx8qxp-lpi2c
       - items:
-          - const: fsl,imx8qxp-lpi2c
+          - enum:
+              - fsl,imx8qm-lpi2c
+              - fsl,imx8qxp-lpi2c
           - const: fsl,imx7ulp-lpi2c
 
   reg: