| Message ID | 20200829062505.4642-1-krzk@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v4] dt-bindings: mmc: fsl-imx-esdhc: Fix i.MX 8 compatible matching | expand |
On Sat, 29 Aug 2020 at 08:25, 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> Applied for next, thanks! Kind regards Uffe > > --- > > Changes since v3: > 1. Fix also example in Documentation/devicetree/bindings/clock/imx8qxp-lpcg.yaml > > Changes since v2: > 1. Remove moved compatibles. > > Changes since v1: > 1. Handle also fsl,imx8mm-usdhc and fsl,imx8qxp-usdhc > --- > .../bindings/clock/imx8qxp-lpcg.yaml | 2 +- > .../bindings/mmc/fsl-imx-esdhc.yaml | 37 ++++++++++--------- > 2 files changed, 21 insertions(+), 18 deletions(-) > > diff --git a/Documentation/devicetree/bindings/clock/imx8qxp-lpcg.yaml b/Documentation/devicetree/bindings/clock/imx8qxp-lpcg.yaml > index 1d5e9bcce4c8..33f3010f48c3 100644 > --- a/Documentation/devicetree/bindings/clock/imx8qxp-lpcg.yaml > +++ b/Documentation/devicetree/bindings/clock/imx8qxp-lpcg.yaml > @@ -62,7 +62,7 @@ examples: > }; > > mmc@5b010000 { > - compatible = "fsl,imx8qxp-usdhc"; > + compatible = "fsl,imx8qxp-usdhc", "fsl,imx7d-usdhc"; > interrupts = <GIC_SPI 232 IRQ_TYPE_LEVEL_HIGH>; > reg = <0x5b010000 0x10000>; > clocks = <&conn_lpcg IMX_CONN_LPCG_SDHC0_IPG_CLK>, > 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 >
diff --git a/Documentation/devicetree/bindings/clock/imx8qxp-lpcg.yaml b/Documentation/devicetree/bindings/clock/imx8qxp-lpcg.yaml index 1d5e9bcce4c8..33f3010f48c3 100644 --- a/Documentation/devicetree/bindings/clock/imx8qxp-lpcg.yaml +++ b/Documentation/devicetree/bindings/clock/imx8qxp-lpcg.yaml @@ -62,7 +62,7 @@ examples: }; mmc@5b010000 { - compatible = "fsl,imx8qxp-usdhc"; + compatible = "fsl,imx8qxp-usdhc", "fsl,imx7d-usdhc"; interrupts = <GIC_SPI 232 IRQ_TYPE_LEVEL_HIGH>; reg = <0x5b010000 0x10000>; clocks = <&conn_lpcg IMX_CONN_LPCG_SDHC0_IPG_CLK>, 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 v3: 1. Fix also example in Documentation/devicetree/bindings/clock/imx8qxp-lpcg.yaml Changes since v2: 1. Remove moved compatibles. Changes since v1: 1. Handle also fsl,imx8mm-usdhc and fsl,imx8qxp-usdhc --- .../bindings/clock/imx8qxp-lpcg.yaml | 2 +- .../bindings/mmc/fsl-imx-esdhc.yaml | 37 ++++++++++--------- 2 files changed, 21 insertions(+), 18 deletions(-)