| Message ID | 20200824162652.21047-12-krzk@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,01/19] dt-bindings: gpio: fsl-imx-gpio: Add i.MX 8 compatibles | expand |
On Mon, Aug 24, 2020 at 06:26:45PM +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 v1: > 1. Handle also fsl,imx8mm-usdhc and fsl,imx8qxp-usdhc > --- > .../bindings/mmc/fsl-imx-esdhc.yaml | 40 +++++++++++-------- > 1 file changed, 23 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..54f05e2a4246 100644 > --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml > +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml > @@ -21,23 +21,29 @@ 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 > + - fsl,imx8mq-usdhc > + - fsl,imx8mm-usdhc > + - fsl,imx8qxp-usdhc These should be dropped. > + - 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 Mon, Aug 24, 2020 at 08:38:01PM -0600, Rob Herring wrote: > On Mon, Aug 24, 2020 at 06:26:45PM +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 v1: > > 1. Handle also fsl,imx8mm-usdhc and fsl,imx8qxp-usdhc > > --- > > .../bindings/mmc/fsl-imx-esdhc.yaml | 40 +++++++++++-------- > > 1 file changed, 23 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..54f05e2a4246 100644 > > --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml > > +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml > > @@ -21,23 +21,29 @@ 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 > > > + - fsl,imx8mq-usdhc > > + - fsl,imx8mm-usdhc > > + - fsl,imx8qxp-usdhc > > These should be dropped. You're right, thanks. 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..54f05e2a4246 100644 --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml @@ -21,23 +21,29 @@ 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 + - fsl,imx8mq-usdhc + - fsl,imx8mm-usdhc + - fsl,imx8qxp-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 v1: 1. Handle also fsl,imx8mm-usdhc and fsl,imx8qxp-usdhc --- .../bindings/mmc/fsl-imx-esdhc.yaml | 40 +++++++++++-------- 1 file changed, 23 insertions(+), 17 deletions(-)