Re: [PATCH RESEND v2 2/6] dt-bindings: watchdog: Convert Allwinner watchdog to a schema

From: Guenter Roeck
Date: Fri Aug 30 2019 - 12:48:25 EST


On Wed, Aug 21, 2019 at 04:38:31PM +0200, Maxime Ripard wrote:
> From: Maxime Ripard <maxime.ripard@xxxxxxxxxxx>
>
> The Allwinner SoCs have a watchdog supported in Linux, with a matching
> Device Tree binding.
>
> Now that we have the DT validation in place, let's convert the device tree
> bindings for that controller over to a YAML schemas.
>
> Reviewed-by: Rob Herring <robh@xxxxxxxxxx>
> Signed-off-by: Maxime Ripard <maxime.ripard@xxxxxxxxxxx>
>
Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>

> ---
>
> Changes from v1:
> - Use generic watchdog schema
> - Use unevaluatedProperties instead of additionalProperties
> ---
> .../watchdog/allwinner,sun4i-a10-wdt.yaml | 48 +++++++++++++++++++
> .../bindings/watchdog/sunxi-wdt.txt | 22 ---------
> 2 files changed, 48 insertions(+), 22 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml
> delete mode 100644 Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
>
> diff --git a/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml b/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml
> new file mode 100644
> index 000000000000..dc7553f57708
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml
> @@ -0,0 +1,48 @@
> +# SPDX-License-Identifier: GPL-2.0
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/watchdog/allwinner,sun4i-a10-wdt.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Allwinner A10 Watchdog Device Tree Bindings
> +
> +allOf:
> + - $ref: "watchdog.yaml#"
> +
> +maintainers:
> + - Chen-Yu Tsai <wens@xxxxxxxx>
> + - Maxime Ripard <maxime.ripard@xxxxxxxxxxx>
> +
> +properties:
> + compatible:
> + oneOf:
> + - const: allwinner,sun4i-a10-wdt
> + - const: allwinner,sun6i-a31-wdt
> + - items:
> + - const: allwinner,sun50i-a64-wdt
> + - const: allwinner,sun6i-a31-wdt
> + - items:
> + - const: allwinner,sun50i-h6-wdt
> + - const: allwinner,sun6i-a31-wdt
> + - items:
> + - const: allwinner,suniv-f1c100s-wdt
> + - const: allwinner,sun4i-a10-wdt
> +
> + reg:
> + maxItems: 1
> +
> +required:
> + - compatible
> + - reg
> +
> +unevaluatedProperties: false
> +
> +examples:
> + - |
> + wdt: watchdog@1c20c90 {
> + compatible = "allwinner,sun4i-a10-wdt";
> + reg = <0x01c20c90 0x10>;
> + timeout-sec = <10>;
> + };
> +
> +...
> diff --git a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
> deleted file mode 100644
> index e65198d82a2b..000000000000
> --- a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -Allwinner SoCs Watchdog timer
> -
> -Required properties:
> -
> -- compatible : should be one of
> - "allwinner,sun4i-a10-wdt"
> - "allwinner,sun6i-a31-wdt"
> - "allwinner,sun50i-a64-wdt","allwinner,sun6i-a31-wdt"
> - "allwinner,sun50i-h6-wdt","allwinner,sun6i-a31-wdt"
> - "allwinner,suniv-f1c100s-wdt", "allwinner,sun4i-a10-wdt"
> -- reg : Specifies base physical address and size of the registers.
> -
> -Optional properties:
> -- timeout-sec : Contains the watchdog timeout in seconds
> -
> -Example:
> -
> -wdt: watchdog@1c20c90 {
> - compatible = "allwinner,sun4i-a10-wdt";
> - reg = <0x01c20c90 0x10>;
> - timeout-sec = <10>;
> -};
> --
> 2.21.0
>