[v2,04/11] dt-bindings: watchdog: convert meson-wdt.txt to dt-schema
Commit Message
Convert the Amlogic Meson6 SoCs Watchdog timer bindings to dt-schema.
Take in account the used interrupts property.
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
.../bindings/watchdog/amlogic,meson6-wdt.yaml | 50 ++++++++++++++++++++++
.../devicetree/bindings/watchdog/meson-wdt.txt | 21 ---------
2 files changed, 50 insertions(+), 21 deletions(-)
Comments
Hi Neil,
On Mon, Jan 9, 2023 at 1:53 PM Neil Armstrong <neil.armstrong@linaro.org> wrote:
[...]
> + compatible:
> + oneOf:
> + - enum:
> + - amlogic,meson6-wdt
> + - amlogic,meson8-wdt
Technically this is not an identical representation of what we had
before which was:
- "amlogic,meson8-wdt" and "amlogic,meson6-wdt" on Meson8 SoCs
We're not using the "amlogic,meson8-wdt" compatible anywhere at the moment.
In the meson_wdt driver it's defined with the same per-SoC data as
"amlogic,meson6-wdt".
Long story short: In my opinion there's no need to change what you
have right now.
If you have to re-spin this then maybe you can add a note to the patch
description.
Please add my:
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Best regards,
Martin
On 10/01/2023 22:48, Martin Blumenstingl wrote:
> Hi Neil,
>
> On Mon, Jan 9, 2023 at 1:53 PM Neil Armstrong <neil.armstrong@linaro.org> wrote:
> [...]
>> + compatible:
>> + oneOf:
>> + - enum:
>> + - amlogic,meson6-wdt
>> + - amlogic,meson8-wdt
> Technically this is not an identical representation of what we had
> before which was:
> - "amlogic,meson8-wdt" and "amlogic,meson6-wdt" on Meson8 SoCs
>
> We're not using the "amlogic,meson8-wdt" compatible anywhere at the moment.
> In the meson_wdt driver it's defined with the same per-SoC data as
> "amlogic,meson6-wdt".
>
> Long story short: In my opinion there's no need to change what you
> have right now.
> If you have to re-spin this then maybe you can add a note to the patch
> description.
> Please add my:
> Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Sorry I was distracted, I'll add a node on the commit message.
Thanks,
Neil
>
>
> Best regards,
> Martin
new file mode 100644
@@ -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@linaro.org>
+ - Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+
+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>;
+ };
deleted file mode 100644
@@ -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>;
-};