Re: [PATCH v3 3/7] dt-bindings: watchdog: convert meson-wdt.txt to dt-schema

From: Guenter Roeck
Date: Tue Jan 31 2023 - 12:06:19 EST


On Mon, Jan 23, 2023 at 11:10:00AM +0100, Neil Armstrong wrote:
> Convert the Amlogic Meson6 SoCs Watchdog timer bindings to dt-schema.
>
> Take in account the used interrupts property.
>
> The "amlogic,meson8-wdt" representation has been simplified
> since there's no users of this compatible used along the
> "amlogic,meson6-wdt".
>
> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
> Reviewed-by: Martin Blumenstingl <martin.blumenstingl@xxxxxxxxxxxxxx>
> Signed-off-by: Neil Armstrong <neil.armstrong@xxxxxxxxxx>

Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>

> ---
> .../bindings/watchdog/amlogic,meson6-wdt.yaml | 50 ++++++++++++++++++++++
> .../devicetree/bindings/watchdog/meson-wdt.txt | 21 ---------
> 2 files changed, 50 insertions(+), 21 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/watchdog/amlogic,meson6-wdt.yaml b/Documentation/devicetree/bindings/watchdog/amlogic,meson6-wdt.yaml
> new file mode 100644
> index 000000000000..84732cb58ec4
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/watchdog/amlogic,meson6-wdt.yaml
> @@ -0,0 +1,50 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/watchdog/amlogic,meson6-wdt.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Amlogic Meson6 SoCs Watchdog timer
> +
> +maintainers:
> + - Neil Armstrong <neil.armstrong@xxxxxxxxxx>
> + - Martin Blumenstingl <martin.blumenstingl@xxxxxxxxxxxxxx>
> +
> +allOf:
> + - $ref: watchdog.yaml#
> +
> +properties:
> + compatible:
> + oneOf:
> + - enum:
> + - amlogic,meson6-wdt
> + - amlogic,meson8-wdt
> + - amlogic,meson8b-wdt
> + - items:
> + - const: amlogic,meson8m2-wdt
> + - const: amlogic,meson8b-wdt
> +
> + interrupts:
> + maxItems: 1
> +
> + reg:
> + maxItems: 1
> +
> +required:
> + - compatible
> + - interrupts
> + - reg
> +
> +unevaluatedProperties: false
> +
> +examples:
> + - |
> + #include <dt-bindings/interrupt-controller/irq.h>
> + #include <dt-bindings/interrupt-controller/arm-gic.h>
> +
> + wdt: watchdog@c1109900 {
> + compatible = "amlogic,meson6-wdt";
> + reg = <0xc1109900 0x8>;
> + interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>;
> + timeout-sec = <10>;
> + };
> diff --git a/Documentation/devicetree/bindings/watchdog/meson-wdt.txt b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt
> deleted file mode 100644
> index 7588cc3971bf..000000000000
> --- a/Documentation/devicetree/bindings/watchdog/meson-wdt.txt
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -Meson SoCs Watchdog timer
> -
> -Required properties:
> -
> -- compatible : depending on the SoC this should be one of:
> - "amlogic,meson6-wdt" on Meson6 SoCs
> - "amlogic,meson8-wdt" and "amlogic,meson6-wdt" on Meson8 SoCs
> - "amlogic,meson8b-wdt" on Meson8b SoCs
> - "amlogic,meson8m2-wdt" and "amlogic,meson8b-wdt" on Meson8m2 SoCs
> -- reg : Specifies base physical address and size of the registers.
> -
> -Optional properties:
> -- timeout-sec: contains the watchdog timeout in seconds.
> -
> -Example:
> -
> -wdt: watchdog@c1109900 {
> - compatible = "amlogic,meson6-wdt";
> - reg = <0xc1109900 0x8>;
> - timeout-sec = <10>;
> -};