leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dt-bindings: mmc: fsl-imx-esdhc: Fix i.MX 8 compatible matching

Browse Source 
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>
Link: https://lore.kernel.org/r/20200829062505.4642-1-krzk@kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Krzysztof Kozlowski 2020-08-29 08:25:05 +02:00 committed by Ulf Hansson
parent 8d62fa831f
commit 80fd350b95
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/devicetree/bindings/clock/imx8qxp-lpcg.yaml
View File

@ -62,7 +62,7 @@ examples:
}; };
mmc@5b010000 { mmc@5b010000 {
compatible = "fsl,imx8qxp-usdhc"; compatible = "fsl,imx8qxp-usdhc", "fsl,imx7d-usdhc";
interrupts = <GIC_SPI 232 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 232 IRQ_TYPE_LEVEL_HIGH>;
reg = <0x5b010000 0x10000>; reg = <0x5b010000 0x10000>;
clocks = <&conn_lpcg IMX_CONN_LPCG_SDHC0_IPG_CLK>, clocks = <&conn_lpcg IMX_CONN_LPCG_SDHC0_IPG_CLK>,

9
Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml
View File

@ -21,7 +21,8 @@ description: |
properties: properties:
compatible: compatible:
enum: oneOf:
- enum:
- fsl,imx25-esdhc - fsl,imx25-esdhc
- fsl,imx35-esdhc - fsl,imx35-esdhc
- fsl,imx51-esdhc - fsl,imx51-esdhc
@ -32,12 +33,14 @@ properties:
- fsl,imx6ull-usdhc - fsl,imx6ull-usdhc
- fsl,imx7d-usdhc - fsl,imx7d-usdhc
- fsl,imx7ulp-usdhc - fsl,imx7ulp-usdhc
- fsl,imx8mq-usdhc - items:
- enum:
- fsl,imx8mm-usdhc - fsl,imx8mm-usdhc
- fsl,imx8mn-usdhc - fsl,imx8mn-usdhc
- fsl,imx8mp-usdhc - fsl,imx8mp-usdhc
- fsl,imx8qm-usdhc - fsl,imx8mq-usdhc
- fsl,imx8qxp-usdhc - fsl,imx8qxp-usdhc
- const: fsl,imx7d-usdhc
reg: reg:
maxItems: 1 maxItems: 1