On Mon, Aug 24, 2020 at 06:26:46PM +0200, Krzysztof Kozlowski wrote:
> DTSes with new i.MX 8M SoCs use two compatibles so update the binding to
> fix dtbs_check warnings like:
>
> arch/arm64/boot/dts/freescale/imx8mn-evk.dt.yaml: efuse@30350000: compatible:1: 'syscon' was expected
> From schema: Documentation/devicetree/bindings/nvmem/imx-ocotp.yaml
>
> arch/arm64/boot/dts/freescale/imx8mn-evk.dt.yaml: efuse@30350000:
> compatible: ['fsl,imx8mn-ocotp', 'fsl,imx8mm-ocotp', 'syscon'] is too long
>
> arch/arm64/boot/dts/freescale/imx8mn-evk.dt.yaml: efuse@30350000:
> compatible: Additional items are not allowed ('syscon' was unexpected)
>
> Signed-off-by: Krzysztof Kozlowski <krzk@xxxxxxxxxx>
> ---
> .../devicetree/bindings/nvmem/imx-ocotp.yaml | 39 ++++++++++++-------
> 1 file changed, 24 insertions(+), 15 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/nvmem/imx-ocotp.yaml b/Documentation/devicetree/bindings/nvmem/imx-ocotp.yaml
> index 1c9d7f05f173..b5b250185afd 100644
> --- a/Documentation/devicetree/bindings/nvmem/imx-ocotp.yaml
> +++ b/Documentation/devicetree/bindings/nvmem/imx-ocotp.yaml
> @@ -19,21 +19,30 @@ allOf:
>
> properties:
> compatible:
> - items:
> - - enum:
> - - fsl,imx6q-ocotp
> - - fsl,imx6sl-ocotp
> - - fsl,imx6sx-ocotp
> - - fsl,imx6ul-ocotp
> - - fsl,imx6ull-ocotp
> - - fsl,imx7d-ocotp
> - - fsl,imx6sll-ocotp
> - - fsl,imx7ulp-ocotp
> - - fsl,imx8mq-ocotp
> - - fsl,imx8mm-ocotp
> - - fsl,imx8mn-ocotp
> - - fsl,imx8mp-ocotp
> - - const: syscon
> + oneOf:
> + - items:
> + - enum:
> + - fsl,imx6q-ocotp
> + - fsl,imx6sl-ocotp
> + - fsl,imx6sx-ocotp
> + - fsl,imx6ul-ocotp
> + - fsl,imx6ull-ocotp
> + - fsl,imx7d-ocotp
> + - fsl,imx6sll-ocotp
> + - fsl,imx7ulp-ocotp
> + - fsl,imx8mq-ocotp
> + - fsl,imx8mm-ocotp
> + - fsl,imx8mn-ocotp
> + - fsl,imx8mp-ocotp
Should be dropped.
> + - const: syscon
> + - items:
> + # The devices are not really compatible with fsl,imx8mm-ocotp, however
> + # the code for getting SoC revision depends on fsl,imx8mm-ocotp compatible.
> + - enum:
> + - fsl,imx8mn-ocotp
> + - fsl,imx8mp-ocotp
> + - const: fsl,imx8mm-ocotp
> + - const: syscon
>
> reg:
> maxItems: 1
> --
> 2.17.1
>
