| Message ID | 20200825193536.7332-10-krzk@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | dt-bindings / arm64: Cleanup of i.MX 8 bindings | expand |
diff --git a/Documentation/devicetree/bindings/mtd/gpmi-nand.yaml b/Documentation/devicetree/bindings/mtd/gpmi-nand.yaml index 3201372b7f85..28ff8c581837 100644 --- a/Documentation/devicetree/bindings/mtd/gpmi-nand.yaml +++ b/Documentation/devicetree/bindings/mtd/gpmi-nand.yaml @@ -20,12 +20,18 @@ description: | properties: compatible: - enum: - - fsl,imx23-gpmi-nand - - fsl,imx28-gpmi-nand - - fsl,imx6q-gpmi-nand - - fsl,imx6sx-gpmi-nand - - fsl,imx7d-gpmi-nand + oneOf: + - enum: + - fsl,imx23-gpmi-nand + - fsl,imx28-gpmi-nand + - fsl,imx6q-gpmi-nand + - fsl,imx6sx-gpmi-nand + - fsl,imx7d-gpmi-nand + - items: + - enum: + - fsl,imx8mm-gpmi-nand + - fsl,imx8mn-gpmi-nand + - const: fsl,imx7d-gpmi-nand reg: items:
DTSes with new i.MX 8M SoCs introduce their own compatibles so add them to fix dtbs_check warnings like: arch/arm64/boot/dts/freescale/imx8mm-evk.dt.yaml: nand-controller@33002000: compatible:0: 'fsl,imx8mm-gpmi-nand' is not one of ['fsl,imx23-gpmi-nand', 'fsl,imx28-gpmi-nand', 'fsl,imx6q-gpmi-nand', 'fsl,imx6sx-gpmi-nand', 'fsl,imx7d-gpmi-nand'] From schema: Documentation/devicetree/bindings/mtd/gpmi-nand.yaml arch/arm64/boot/dts/freescale/imx8mm-evk.dt.yaml: nand-controller@33002000: compatible: ['fsl,imx8mm-gpmi-nand', 'fsl,imx7d-gpmi-nand'] is too long arch/arm64/boot/dts/freescale/imx8mm-evk.dt.yaml: nand-controller@33002000: compatible: Additional items are not allowed ('fsl,imx7d-gpmi-nand' was unexpected) Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Reviewed-by: Rob Herring <robh@kernel.org> --- .../devicetree/bindings/mtd/gpmi-nand.yaml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)