Add the 'fsl,imx6ul-usdhc' value to the compatible properties list in
the fsl-imx-esdhc.yaml file. This is required to match the compatible
strings present in the 'mmc@2190000' node of 'imx6ul-prti6g.dtb'. This
commit addresses the following dtbs_check warning:
imx6ul-prti6g.dtb: mmc@2190000: compatible: 'oneOf' conditional failed,
one must be fixed: ['fsl,imx6ul-usdhc', 'fsl,imx6sx-usdhc'] is too long
'fsl,imx6ul-usdhc' is not one of ['fsl,imx25-esdhc', 'fsl,imx35-esdhc',
'fsl,imx51-esdhc', 'fsl,imx53-esdhc', 'fsl,imx6q-usdhc',
'fsl,imx6sl-usdhc', 'fsl,imx6sx-usdhc', 'fsl,imx7d-usdhc',
'fsl,imx7ulp-usdhc', 'fsl,imx8mm-usdhc', 'fsl,imxrt1050-usdhc',
'nxp,s32g2-usdhc']
From schema: Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml
Signed-off-by: Oleksij Rempel <[email protected]>
---
Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml
index fbfd822b9270..090e781705d3 100644
--- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml
+++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml
@@ -30,6 +30,7 @@ properties:
- fsl,imx6q-usdhc
- fsl,imx6sl-usdhc
- fsl,imx6sx-usdhc
+ - fsl,imx6ul-usdhc
- fsl,imx7d-usdhc
- fsl,imx7ulp-usdhc
- fsl,imx8mm-usdhc
@@ -42,6 +43,7 @@ properties:
- enum:
- fsl,imx6sll-usdhc
- fsl,imx6ull-usdhc
+ - fsl,imx6ul-usdhc
- const: fsl,imx6sx-usdhc
- items:
- const: fsl,imx7d-usdhc
--
2.39.2
On Thu, Jun 01, 2023 at 12:14:45PM +0200, Oleksij Rempel wrote:
> Add the 'fsl,imx6ul-usdhc' value to the compatible properties list in
> the fsl-imx-esdhc.yaml file. This is required to match the compatible
> strings present in the 'mmc@2190000' node of 'imx6ul-prti6g.dtb'. This
> commit addresses the following dtbs_check warning:
> imx6ul-prti6g.dtb: mmc@2190000: compatible: 'oneOf' conditional failed,
> one must be fixed: ['fsl,imx6ul-usdhc', 'fsl,imx6sx-usdhc'] is too long
> 'fsl,imx6ul-usdhc' is not one of ['fsl,imx25-esdhc', 'fsl,imx35-esdhc',
> 'fsl,imx51-esdhc', 'fsl,imx53-esdhc', 'fsl,imx6q-usdhc',
> 'fsl,imx6sl-usdhc', 'fsl,imx6sx-usdhc', 'fsl,imx7d-usdhc',
> 'fsl,imx7ulp-usdhc', 'fsl,imx8mm-usdhc', 'fsl,imxrt1050-usdhc',
> 'nxp,s32g2-usdhc']
> From schema: Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml
>
> Signed-off-by: Oleksij Rempel <[email protected]>
> ---
> Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml
> index fbfd822b9270..090e781705d3 100644
> --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml
> +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml
> @@ -30,6 +30,7 @@ properties:
> - fsl,imx6q-usdhc
> - fsl,imx6sl-usdhc
> - fsl,imx6sx-usdhc
> + - fsl,imx6ul-usdhc
How come this gets added as a standalone compatible _and_ one that
should fall back to imx6sx?
> - fsl,imx7d-usdhc
> - fsl,imx7ulp-usdhc
> - fsl,imx8mm-usdhc
> @@ -42,6 +43,7 @@ properties:
> - enum:
> - fsl,imx6sll-usdhc
> - fsl,imx6ull-usdhc
> + - fsl,imx6ul-usdhc
> - const: fsl,imx6sx-usdhc
> - items:
> - const: fsl,imx7d-usdhc
> --
> 2.39.2
>
On Thu, Jun 01, 2023 at 07:18:31PM +0100, Conor Dooley wrote:
> On Thu, Jun 01, 2023 at 12:14:45PM +0200, Oleksij Rempel wrote:
> > Add the 'fsl,imx6ul-usdhc' value to the compatible properties list in
> > the fsl-imx-esdhc.yaml file. This is required to match the compatible
> > strings present in the 'mmc@2190000' node of 'imx6ul-prti6g.dtb'. This
> > commit addresses the following dtbs_check warning:
> > imx6ul-prti6g.dtb: mmc@2190000: compatible: 'oneOf' conditional failed,
> > one must be fixed: ['fsl,imx6ul-usdhc', 'fsl,imx6sx-usdhc'] is too long
> > 'fsl,imx6ul-usdhc' is not one of ['fsl,imx25-esdhc', 'fsl,imx35-esdhc',
> > 'fsl,imx51-esdhc', 'fsl,imx53-esdhc', 'fsl,imx6q-usdhc',
> > 'fsl,imx6sl-usdhc', 'fsl,imx6sx-usdhc', 'fsl,imx7d-usdhc',
> > 'fsl,imx7ulp-usdhc', 'fsl,imx8mm-usdhc', 'fsl,imxrt1050-usdhc',
> > 'nxp,s32g2-usdhc']
> > From schema: Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml
> >
> > Signed-off-by: Oleksij Rempel <[email protected]>
> > ---
> > Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml
> > index fbfd822b9270..090e781705d3 100644
> > --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml
> > +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml
> > @@ -30,6 +30,7 @@ properties:
> > - fsl,imx6q-usdhc
> > - fsl,imx6sl-usdhc
> > - fsl,imx6sx-usdhc
> > + - fsl,imx6ul-usdhc
>
> How come this gets added as a standalone compatible _and_ one that
> should fall back to imx6sx?
Whoops, sent too soon.
I meant to point out that the only user in-tree uses the fallback to
imx6sx.
Cheers,
Conor.
> > - fsl,imx7d-usdhc
> > - fsl,imx7ulp-usdhc
> > - fsl,imx8mm-usdhc
> > @@ -42,6 +43,7 @@ properties:
> > - enum:
> > - fsl,imx6sll-usdhc
> > - fsl,imx6ull-usdhc
> > + - fsl,imx6ul-usdhc
> > - const: fsl,imx6sx-usdhc
> > - items:
> > - const: fsl,imx7d-usdhc
> > --
> > 2.39.2
> >
On 01/06/2023 12:14, Oleksij Rempel wrote:
> Add the 'fsl,imx6ul-usdhc' value to the compatible properties list in
> the fsl-imx-esdhc.yaml file. This is required to match the compatible
> strings present in the 'mmc@2190000' node of 'imx6ul-prti6g.dtb'. This
> commit addresses the following dtbs_check warning:
> imx6ul-prti6g.dtb: mmc@2190000: compatible: 'oneOf' conditional failed,
> one must be fixed: ['fsl,imx6ul-usdhc', 'fsl,imx6sx-usdhc'] is too long
> 'fsl,imx6ul-usdhc' is not one of ['fsl,imx25-esdhc', 'fsl,imx35-esdhc',
> 'fsl,imx51-esdhc', 'fsl,imx53-esdhc', 'fsl,imx6q-usdhc',
> 'fsl,imx6sl-usdhc', 'fsl,imx6sx-usdhc', 'fsl,imx7d-usdhc',
> 'fsl,imx7ulp-usdhc', 'fsl,imx8mm-usdhc', 'fsl,imxrt1050-usdhc',
> 'nxp,s32g2-usdhc']
> From schema: Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml
Except what Conor wrote, please don't wrap that much the error log - it
is unreadable. Trim it, remove unneeded parts and keep some decent
one/two lines even if it exceeds the commit msg. This applies to other
patches as well.
Best regards,
Krzysztof