diff mbox series

[v3,08/19] dt-bindings: watchdog: fsl-imx-wdt: Add i.MX 8M compatibles

Message ID 20200825193536.7332-9-krzk@kernel.org (mailing list archive)
State New, archived
Headers show
Series dt-bindings / arm64: Cleanup of i.MX 8 bindings | expand

Commit Message

Krzysztof Kozlowski Aug. 25, 2020, 7:35 p.m. UTC
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-var-som-symphony.dt.yaml: watchdog@30280000:
    compatible:0: 'fsl,imx8mm-wdt' is not one of ['fsl,imx21-wdt']
    From schema: Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml

  arch/arm64/boot/dts/freescale/imx8mm-var-som-symphony.dt.yaml: watchdog@30280000:
    compatible: ['fsl,imx8mm-wdt', 'fsl,imx21-wdt'] is too long

  arch/arm64/boot/dts/freescale/imx8mm-var-som-symphony.dt.yaml: watchdog@30280000:
    compatible: Additional items are not allowed ('fsl,imx21-wdt' was unexpected)

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: Rob Herring <robh@kernel.org>
---
 .../devicetree/bindings/watchdog/fsl-imx-wdt.yaml     | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

Comments

Guenter Roeck Aug. 25, 2020, 10:21 p.m. UTC | #1
On 8/25/20 12:35 PM, Krzysztof Kozlowski wrote:
> 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-var-som-symphony.dt.yaml: watchdog@30280000:
>     compatible:0: 'fsl,imx8mm-wdt' is not one of ['fsl,imx21-wdt']
>     From schema: Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml
> 
>   arch/arm64/boot/dts/freescale/imx8mm-var-som-symphony.dt.yaml: watchdog@30280000:
>     compatible: ['fsl,imx8mm-wdt', 'fsl,imx21-wdt'] is too long
> 
>   arch/arm64/boot/dts/freescale/imx8mm-var-som-symphony.dt.yaml: watchdog@30280000:
>     compatible: Additional items are not allowed ('fsl,imx21-wdt' was unexpected)
> 
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
> Reviewed-by: Rob Herring <robh@kernel.org>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  .../devicetree/bindings/watchdog/fsl-imx-wdt.yaml     | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml
> index d96b93b11fad..991b4e33486e 100644
> --- a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml
> +++ b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml
> @@ -14,8 +14,15 @@ allOf:
>  
>  properties:
>    compatible:
> -    enum:
> -      - fsl,imx21-wdt
> +    oneOf:
> +      - const: fsl,imx21-wdt
> +      - items:
> +          - enum:
> +              - fsl,imx8mm-wdt
> +              - fsl,imx8mn-wdt
> +              - fsl,imx8mp-wdt
> +              - fsl,imx8mq-wdt
> +          - const: fsl,imx21-wdt
>  
>    reg:
>      maxItems: 1
>
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml
index d96b93b11fad..991b4e33486e 100644
--- a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml
@@ -14,8 +14,15 @@  allOf:
 
 properties:
   compatible:
-    enum:
-      - fsl,imx21-wdt
+    oneOf:
+      - const: fsl,imx21-wdt
+      - items:
+          - enum:
+              - fsl,imx8mm-wdt
+              - fsl,imx8mn-wdt
+              - fsl,imx8mp-wdt
+              - fsl,imx8mq-wdt
+          - const: fsl,imx21-wdt
 
   reg:
     maxItems: 1