| Message ID | 20200825193536.7332-13-krzk@kernel.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | dt-bindings / arm64: Cleanup of i.MX 8 bindings | expand |
On Tue, 25 Aug 2020 at 21:37, Krzysztof Kozlowski <krzk@kernel.org> wrote: > > The i.MX 8 DTSes use two compatibles so update the binding to fix > dtbs_check warnings like: > > arch/arm64/boot/dts/freescale/imx8mn-evk.dt.yaml: mmc@30b40000: > compatible: ['fsl,imx8mn-usdhc', 'fsl,imx7d-usdhc'] is too long > From schema: Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml > > arch/arm64/boot/dts/freescale/imx8mn-evk.dt.yaml: mmc@30b40000: > compatible: Additional items are not allowed ('fsl,imx7d-usdhc' was unexpected) > > arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dt.yaml: mmc@30b40000: > compatible: ['fsl,imx8mn-usdhc', 'fsl,imx7d-usdhc'] is too long > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Rob, Krzysztof - do you want me to pick this one? Kind regards Uffe > > --- > > Changes since v2: > 1. Remove moved compatibles. > > Changes since v1: > 1. Handle also fsl,imx8mm-usdhc and fsl,imx8qxp-usdhc > --- > .../bindings/mmc/fsl-imx-esdhc.yaml | 37 ++++++++++--------- > 1 file changed, 20 insertions(+), 17 deletions(-) > > diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml > index 10b45966f1b8..e71d13c2d109 100644 > --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml > +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml > @@ -21,23 +21,26 @@ description: | > > properties: > compatible: > - enum: > - - fsl,imx25-esdhc > - - fsl,imx35-esdhc > - - fsl,imx51-esdhc > - - fsl,imx53-esdhc > - - fsl,imx6q-usdhc > - - fsl,imx6sl-usdhc > - - fsl,imx6sx-usdhc > - - fsl,imx6ull-usdhc > - - fsl,imx7d-usdhc > - - fsl,imx7ulp-usdhc > - - fsl,imx8mq-usdhc > - - fsl,imx8mm-usdhc > - - fsl,imx8mn-usdhc > - - fsl,imx8mp-usdhc > - - fsl,imx8qm-usdhc > - - fsl,imx8qxp-usdhc > + oneOf: > + - enum: > + - fsl,imx25-esdhc > + - fsl,imx35-esdhc > + - fsl,imx51-esdhc > + - fsl,imx53-esdhc > + - fsl,imx6q-usdhc > + - fsl,imx6sl-usdhc > + - fsl,imx6sx-usdhc > + - fsl,imx6ull-usdhc > + - fsl,imx7d-usdhc > + - fsl,imx7ulp-usdhc > + - items: > + - enum: > + - fsl,imx8mm-usdhc > + - fsl,imx8mn-usdhc > + - fsl,imx8mp-usdhc > + - fsl,imx8mq-usdhc > + - fsl,imx8qxp-usdhc > + - const: fsl,imx7d-usdhc > > reg: > maxItems: 1 > -- > 2.17.1 >
On Fri, Aug 28, 2020 at 10:45:40AM +0200, Ulf Hansson wrote: > On Tue, 25 Aug 2020 at 21:37, Krzysztof Kozlowski <krzk@kernel.org> wrote: > > > > The i.MX 8 DTSes use two compatibles so update the binding to fix > > dtbs_check warnings like: > > > > arch/arm64/boot/dts/freescale/imx8mn-evk.dt.yaml: mmc@30b40000: > > compatible: ['fsl,imx8mn-usdhc', 'fsl,imx7d-usdhc'] is too long > > From schema: Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml > > > > arch/arm64/boot/dts/freescale/imx8mn-evk.dt.yaml: mmc@30b40000: > > compatible: Additional items are not allowed ('fsl,imx7d-usdhc' was unexpected) > > > > arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dt.yaml: mmc@30b40000: > > compatible: ['fsl,imx8mn-usdhc', 'fsl,imx7d-usdhc'] is too long > > > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > Rob, Krzysztof - do you want me to pick this one? dt-bindings are independent so they can be applied individually. I don't mind you taking it but still Rob's ack/review would be needed. Other choice is that entire dt-bindings series go through Rob's tree. Rob, what's your preference? Best regards, Krzysztof
On Tue, 25 Aug 2020 21:35:29 +0200, Krzysztof Kozlowski wrote: > The i.MX 8 DTSes use two compatibles so update the binding to fix > dtbs_check warnings like: > > arch/arm64/boot/dts/freescale/imx8mn-evk.dt.yaml: mmc@30b40000: > compatible: ['fsl,imx8mn-usdhc', 'fsl,imx7d-usdhc'] is too long > From schema: Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml > > arch/arm64/boot/dts/freescale/imx8mn-evk.dt.yaml: mmc@30b40000: > compatible: Additional items are not allowed ('fsl,imx7d-usdhc' was unexpected) > > arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dt.yaml: mmc@30b40000: > compatible: ['fsl,imx8mn-usdhc', 'fsl,imx7d-usdhc'] is too long > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > --- > > Changes since v2: > 1. Remove moved compatibles. > > Changes since v1: > 1. Handle also fsl,imx8mm-usdhc and fsl,imx8qxp-usdhc > --- > .../bindings/mmc/fsl-imx-esdhc.yaml | 37 ++++++++++--------- > 1 file changed, 20 insertions(+), 17 deletions(-) > My bot found errors running 'make dt_binding_check' on your patch: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/clock/imx8qxp-lpcg.example.dt.yaml: mmc@5b010000: compatible: ['fsl,imx8qxp-usdhc'] is not valid under any of the given schemas (Possible causes of the failure): /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/clock/imx8qxp-lpcg.example.dt.yaml: mmc@5b010000: compatible: ['fsl,imx8qxp-usdhc'] is too short /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/clock/imx8qxp-lpcg.example.dt.yaml: mmc@5b010000: compatible:0: 'fsl,imx8qxp-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,imx6ull-usdhc', 'fsl,imx7d-usdhc', 'fsl,imx7ulp-usdhc'] From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml See https://patchwork.ozlabs.org/patch/1351360 If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure dt-schema is up to date: pip3 install git+https://github.com/devicetree-org/dt-schema.git@master --upgrade Please check and re-submit.
On Fri, 28 Aug 2020 at 23:38, Rob Herring <robh@kernel.org> wrote: > > On Tue, 25 Aug 2020 21:35:29 +0200, Krzysztof Kozlowski wrote: > > The i.MX 8 DTSes use two compatibles so update the binding to fix > > dtbs_check warnings like: > > > > arch/arm64/boot/dts/freescale/imx8mn-evk.dt.yaml: mmc@30b40000: > > compatible: ['fsl,imx8mn-usdhc', 'fsl,imx7d-usdhc'] is too long > > From schema: Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml > > > > arch/arm64/boot/dts/freescale/imx8mn-evk.dt.yaml: mmc@30b40000: > > compatible: Additional items are not allowed ('fsl,imx7d-usdhc' was unexpected) > > > > arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dt.yaml: mmc@30b40000: > > compatible: ['fsl,imx8mn-usdhc', 'fsl,imx7d-usdhc'] is too long > > > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > > > --- > > > > Changes since v2: > > 1. Remove moved compatibles. > > > > Changes since v1: > > 1. Handle also fsl,imx8mm-usdhc and fsl,imx8qxp-usdhc > > --- > > .../bindings/mmc/fsl-imx-esdhc.yaml | 37 ++++++++++--------- > > 1 file changed, 20 insertions(+), 17 deletions(-) > > > > > My bot found errors running 'make dt_binding_check' on your patch: > > /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/clock/imx8qxp-lpcg.example.dt.yaml: mmc@5b010000: compatible: ['fsl,imx8qxp-usdhc'] is not valid under any of the given schemas (Possible causes of the failure): > /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/clock/imx8qxp-lpcg.example.dt.yaml: mmc@5b010000: compatible: ['fsl,imx8qxp-usdhc'] is too short I will send a v4 just for this one patch. All others seem to be good. Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml index 10b45966f1b8..e71d13c2d109 100644 --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml @@ -21,23 +21,26 @@ description: | properties: compatible: - enum: - - fsl,imx25-esdhc - - fsl,imx35-esdhc - - fsl,imx51-esdhc - - fsl,imx53-esdhc - - fsl,imx6q-usdhc - - fsl,imx6sl-usdhc - - fsl,imx6sx-usdhc - - fsl,imx6ull-usdhc - - fsl,imx7d-usdhc - - fsl,imx7ulp-usdhc - - fsl,imx8mq-usdhc - - fsl,imx8mm-usdhc - - fsl,imx8mn-usdhc - - fsl,imx8mp-usdhc - - fsl,imx8qm-usdhc - - fsl,imx8qxp-usdhc + oneOf: + - enum: + - fsl,imx25-esdhc + - fsl,imx35-esdhc + - fsl,imx51-esdhc + - fsl,imx53-esdhc + - fsl,imx6q-usdhc + - fsl,imx6sl-usdhc + - fsl,imx6sx-usdhc + - fsl,imx6ull-usdhc + - fsl,imx7d-usdhc + - fsl,imx7ulp-usdhc + - items: + - enum: + - fsl,imx8mm-usdhc + - fsl,imx8mn-usdhc + - fsl,imx8mp-usdhc + - fsl,imx8mq-usdhc + - fsl,imx8qxp-usdhc + - const: fsl,imx7d-usdhc reg: maxItems: 1
The i.MX 8 DTSes use two compatibles so update the binding to fix dtbs_check warnings like: arch/arm64/boot/dts/freescale/imx8mn-evk.dt.yaml: mmc@30b40000: compatible: ['fsl,imx8mn-usdhc', 'fsl,imx7d-usdhc'] is too long From schema: Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml arch/arm64/boot/dts/freescale/imx8mn-evk.dt.yaml: mmc@30b40000: compatible: Additional items are not allowed ('fsl,imx7d-usdhc' was unexpected) arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dt.yaml: mmc@30b40000: compatible: ['fsl,imx8mn-usdhc', 'fsl,imx7d-usdhc'] is too long Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> --- Changes since v2: 1. Remove moved compatibles. Changes since v1: 1. Handle also fsl,imx8mm-usdhc and fsl,imx8qxp-usdhc --- .../bindings/mmc/fsl-imx-esdhc.yaml | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-)