Skip to contentSkip to conversation

dt-bindings: watchdog: Add YAML schemas for the generic watchdog bindings

PATCH Superseded Maxime Ripard 3 participants 11 messages Aug 19, 2019 – Aug 21, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/6 dt-bindings: watchdog: Add YAML schemas for the generic watchdog bindings

From: Maxime Ripard <[email protected]>

The watchdogs have a bunch of generic properties that are needed in a device tree. Add a YAML schemas for those.

---

Changes from v1:
- New patch

---
 .../bindings/watchdog/watchdog.yaml           | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/watchdog/watchdog.yaml
Documentation/devicetree/bindings/watchdog/watchdog.yaml new file +26 -0
new file mode 100644
index 000000000000..187bf6cb62bf
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/watchdog/watchdog.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Watchdog Generic Bindings
+
+maintainers:
+  - Guenter Roeck <[email protected]>
+  - Wim Van Sebroeck <[email protected]>
+
+description: |
+  This document describes generic bindings which can be used to
+  describe watchdog devices in a device tree.
+
+properties:
+  $nodename:
+    pattern: "^watchdog(@.*|-[0-9a-f])?$"
+
+  timeout-sec:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description:
+      Contains the watchdog timeout in seconds.
+
+...
Signature · 1 line
2.21.0
#1 lore raw

PATCH v2 2/6 dt-bindings: watchdog: Convert Allwinner watchdog to a schema

From: Maxime Ripard <[email protected]>

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.

---

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
Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml new file +48 -0
new file mode 100644
index 000000000000..dc7553f57708
@@ -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 <[email protected]>
+  - Maxime Ripard <[email protected]>
+
+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>;
+    };
+
+...
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt deleted +0 -22
deleted file mode 100644
index e65198d82a2b..000000000000
@@ -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>;
-};
Signature · 1 line
2.21.0
Reviewed-by on v2 2/6
#2 lore raw

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

Quoted 16 lines · Maxime Ripard

From: Maxime Ripard <[email protected]>

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.

---

Changes from v1:
- Use generic watchdog schema
- Use unevaluatedProperties instead of additionalProperties

Quoted 6 lines
---
 .../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
#3 lore raw

PATCH v2 3/6 dt-bindings: watchdog: sun4i: Add the watchdog interrupts

In reply to Maxime Ripard

From: Maxime Ripard <[email protected]>

The Allwinner watchdog has an interrupt, either shared or dedicated depending on the SoC, that has been described in some DT, but not all of them.

The binding is also completely missing that description. Let's add that property to be consistent.

---
 .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml           | 5 +++++
 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml +5 -0
index dc7553f57708..31c95c404619 100644
@@ -31,9 +31,13 @@ properties:
   reg:
     maxItems: 1
 
+  interrupts:
+    maxItems: 1
+
 required:
   - compatible
   - reg
+  - interrupts
 
 unevaluatedProperties: false
 
@@ -42,6 +46,7 @@ examples:
     wdt: watchdog@1c20c90 {
         compatible = "allwinner,sun4i-a10-wdt";
         reg = <0x01c20c90 0x10>;
+        interrupts = <24>;
         timeout-sec = <10>;
     };
 
Signature · 1 line
2.21.0
#4 lore raw

PATCH v2 4/6 dt-bindings: watchdog: sun4i: Add the watchdog clock

In reply to Maxime Ripard

From: Maxime Ripard <[email protected]>

The Allwinner watchdog has a clock that has been described in some DT, but not all of them.

The binding is also completely missing that description. Let's add that property to be consistent.

---

Changes from v1:
- New patch

---
 .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml           | 5 +++++
 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml +5 -0
index 31c95c404619..3a54f58683a0 100644
@@ -31,12 +31,16 @@ properties:
   reg:
     maxItems: 1
 
+  clocks:
+    maxItems: 1
+
   interrupts:
     maxItems: 1
 
 required:
   - compatible
   - reg
+  - clocks
   - interrupts
 
 unevaluatedProperties: false
@@ -47,6 +51,7 @@ examples:
         compatible = "allwinner,sun4i-a10-wdt";
         reg = <0x01c20c90 0x10>;
         interrupts = <24>;
+        clocks = <&osc24M>;
         timeout-sec = <10>;
     };
 
Signature · 1 line
2.21.0
Reviewed-by on v2 4/6
#5 lore raw

Re: [PATCH v2 4/6] dt-bindings: watchdog: sun4i: Add the watchdog clock

Quoted 11 lines · Maxime Ripard

From: Maxime Ripard <[email protected]>

The Allwinner watchdog has a clock that has been described in some DT, but not all of them.

The binding is also completely missing that description. Let's add that property to be consistent.

Quoted 7 lines

---

Changes from v1:
- New patch

---
 .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml           | 5 +++++
 1 file changed, 5 insertions(+)
#6 lore raw

PATCH v2 5/6 ARM: dts: sunxi: Add missing watchdog interrupts

In reply to Maxime Ripard

From: Maxime Ripard <[email protected]>

The watchdog has an interrupt on all our SoCs, but it wasn't always listed. Add it to the devicetree where it's missing.

---
 arch/arm/boot/dts/sun4i-a10.dtsi | 1 +
 arch/arm/boot/dts/sun5i.dtsi     | 1 +
 arch/arm/boot/dts/sun6i-a31.dtsi | 1 +
 arch/arm/boot/dts/sun7i-a20.dtsi | 1 +
 arch/arm/boot/dts/sun8i-r40.dtsi | 1 +
 5 files changed, 5 insertions(+)
arch/arm/boot/dts/sun4i-a10.dtsi +1 -0
index 077d45c7db6f..eed9fcb46185 100644
@@ -815,6 +815,7 @@
 		wdt: watchdog@1c20c90 {
 			compatible = "allwinner,sun4i-a10-wdt";
 			reg = <0x01c20c90 0x10>;
+			interrupts = <24>;
 		};
 
 		rtc: rtc@1c20d00 {
arch/arm/boot/dts/sun5i.dtsi +1 -0
index 4e725afe7203..29a825f7afd1 100644
@@ -600,6 +600,7 @@
 		wdt: watchdog@1c20c90 {
 			compatible = "allwinner,sun4i-a10-wdt";
 			reg = <0x01c20c90 0x10>;
+			interrupts = <24>;
 		};
 
 		ir0: ir@1c21800 {
arch/arm/boot/dts/sun6i-a31.dtsi +1 -0
index 916f99db6206..b32d2d7cad4e 100644
@@ -744,6 +744,7 @@
 		wdt1: watchdog@1c20ca0 {
 			compatible = "allwinner,sun6i-a31-wdt";
 			reg = <0x01c20ca0 0x20>;
+			interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
 		};
 
 		spdif: spdif@1c21000 {
arch/arm/boot/dts/sun7i-a20.dtsi +1 -0
index 9ad8e445b240..aeb682e757f2 100644
@@ -1115,6 +1115,7 @@
 		wdt: watchdog@1c20c90 {
 			compatible = "allwinner,sun4i-a10-wdt";
 			reg = <0x01c20c90 0x10>;
+			interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
 		};
 
 		rtc: rtc@1c20d00 {
arch/arm/boot/dts/sun8i-r40.dtsi +1 -0
index 09e20768228c..f1be554b5894 100644
@@ -404,6 +404,7 @@
 		wdt: watchdog@1c20c90 {
 			compatible = "allwinner,sun4i-a10-wdt";
 			reg = <0x01c20c90 0x10>;
+			interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
 		};
 
 		uart0: serial@1c28000 {
Signature · 1 line
2.21.0
#7 lore raw

PATCH v2 6/6 ARM: dts: sunxi: Add missing watchdog clocks

In reply to Maxime Ripard

From: Maxime Ripard <[email protected]>

The watchdog has a clock on all our SoCs, but it wasn't always listed. Add it to the devicetree where it's missing.

---

Changes from v1:
- New patch

---
 arch/arm/boot/dts/sun4i-a10.dtsi              | 1 +
 arch/arm/boot/dts/sun5i.dtsi                  | 1 +
 arch/arm/boot/dts/sun6i-a31.dtsi              | 1 +
 arch/arm/boot/dts/sun7i-a20.dtsi              | 1 +
 arch/arm/boot/dts/sun8i-a23-a33.dtsi          | 1 +
 arch/arm/boot/dts/sun8i-r40.dtsi              | 1 +
 arch/arm/boot/dts/sun8i-v3s.dtsi              | 1 +
 arch/arm/boot/dts/sunxi-h3-h5.dtsi            | 1 +
 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 1 +
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi  | 2 ++
 10 files changed, 11 insertions(+)
arch/arm/boot/dts/sun4i-a10.dtsi +1 -0
index eed9fcb46185..ce823c44e98a 100644
@@ -816,6 +816,7 @@
 			compatible = "allwinner,sun4i-a10-wdt";
 			reg = <0x01c20c90 0x10>;
 			interrupts = <24>;
+			clocks = <&osc24M>;
 		};
 
 		rtc: rtc@1c20d00 {
arch/arm/boot/dts/sun5i.dtsi +1 -0
index 29a825f7afd1..cfb1efc8828c 100644
@@ -601,6 +601,7 @@
 			compatible = "allwinner,sun4i-a10-wdt";
 			reg = <0x01c20c90 0x10>;
 			interrupts = <24>;
+			clocks = <&osc24M>;
 		};
 
 		ir0: ir@1c21800 {
arch/arm/boot/dts/sun6i-a31.dtsi +1 -0
index b32d2d7cad4e..72282fd6c2d0 100644
@@ -745,6 +745,7 @@
 			compatible = "allwinner,sun6i-a31-wdt";
 			reg = <0x01c20ca0 0x20>;
 			interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&osc24M>;
 		};
 
 		spdif: spdif@1c21000 {
arch/arm/boot/dts/sun7i-a20.dtsi +1 -0
index aeb682e757f2..02fad11c125e 100644
@@ -1116,6 +1116,7 @@
 			compatible = "allwinner,sun4i-a10-wdt";
 			reg = <0x01c20c90 0x10>;
 			interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&osc24M>;
 		};
 
 		rtc: rtc@1c20d00 {
arch/arm/boot/dts/sun8i-a23-a33.dtsi +1 -0
index 954489b4ec66..52eed0ae3607 100644
@@ -452,6 +452,7 @@
 			compatible = "allwinner,sun6i-a31-wdt";
 			reg = <0x01c20ca0 0x20>;
 			interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&osc24M>;
 		};
 
 		pwm: pwm@1c21400 {
arch/arm/boot/dts/sun8i-r40.dtsi +1 -0
index f1be554b5894..bde068111b85 100644
@@ -405,6 +405,7 @@
 			compatible = "allwinner,sun4i-a10-wdt";
 			reg = <0x01c20c90 0x10>;
 			interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&osc24M>;
 		};
 
 		uart0: serial@1c28000 {
arch/arm/boot/dts/sun8i-v3s.dtsi +1 -0
index ddbcc28dc541..23ba56df38f7 100644
@@ -339,6 +339,7 @@
 			compatible = "allwinner,sun6i-a31-wdt";
 			reg = <0x01c20ca0 0x20>;
 			interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&osc24M>;
 		};
 
 		lradc: lradc@1c22800 {
arch/arm/boot/dts/sunxi-h3-h5.dtsi +1 -0
index 224e105a994a..eba190b3f9de 100644
@@ -574,6 +574,7 @@
 			compatible = "allwinner,sun6i-a31-wdt";
 			reg = <0x01c20ca0 0x20>;
 			interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&osc24M>;
 		};
 
 		spdif: spdif@1c21000 {
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +1 -0
index ddb6f11e89df..69128a6dfc46 100644
@@ -1169,6 +1169,7 @@
 				     "allwinner,sun6i-a31-wdt";
 			reg = <0x01c20ca0 0x20>;
 			interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&osc24M>;
 		};
 	};
 };
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +2 -0
index e8bed58e7246..78e5b9e97c52 100644
@@ -225,6 +225,7 @@
 				     "allwinner,sun6i-a31-wdt";
 			reg = <0x030090a0 0x20>;
 			interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&osc24M>;
 			/* Broken on some H6 boards */
 			status = "disabled";
 		};
@@ -648,6 +649,7 @@
 				     "allwinner,sun6i-a31-wdt";
 			reg = <0x07020400 0x20>;
 			interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&osc24M>;
 		};
 
 		r_intc: interrupt-controller@7021000 {
Signature · 1 line
2.21.0
Reviewed-by on v2 1/6
#8 lore raw
In reply to Maxime Ripard
Quoted 8 lines · Maxime Ripard

From: Maxime Ripard <[email protected]>

The watchdogs have a bunch of generic properties that are needed in a device tree. Add a YAML schemas for those.

Quoted 8 lines

---

Changes from v1:
- New patch

---
 .../bindings/watchdog/watchdog.yaml           | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/watchdog/watchdog.yaml
maintainer
#9 lore raw
In reply to Maxime Ripard
Quoted 6 lines · Maxime Ripard

From: Maxime Ripard <[email protected]>

The watchdogs have a bunch of generic properties that are needed in a device tree. Add a YAML schemas for those.

What is the target subsystem for this series ? You didn't copy the watchdog mailing list, so I assume it won't be the watchdog subsystem.

Thanks,
Guenter

Quoted 43 lines

---

Changes from v1:
- New patch

---
  .../bindings/watchdog/watchdog.yaml           | 26 +++++++++++++++++++
  1 file changed, 26 insertions(+)

create mode 100644 Documentation/devicetree/bindings/watchdog/watchdog.yaml

Documentation/devicetree/bindings/watchdog/watchdog.yaml new file +26 -0
new file mode 100644
index 000000000000..187bf6cb62bf
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/watchdog/watchdog.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Watchdog Generic Bindings
+
+maintainers:
+  - Guenter Roeck <[email protected]>
+  - Wim Van Sebroeck <[email protected]>
+
+description: |
+  This document describes generic bindings which can be used to
+  describe watchdog devices in a device tree.
+
+properties:
+  $nodename:
+    pattern: "^watchdog(@.*|-[0-9a-f])?$"
+
+  timeout-sec:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description:
+      Contains the watchdog timeout in seconds.
+
+...
#10 lore raw

Hi Guenter,

Quoted 10 lines · Guenter Roeck
Quoted 6 lines · Maxime Ripard

From: Maxime Ripard <[email protected]>

The watchdogs have a bunch of generic properties that are needed in a device tree. Add a YAML schemas for those.

What is the target subsystem for this series ? You didn't copy the watchdog mailing list, so I assume it won't be the watchdog subsystem.

Sorry for that :/

It can either go through the DT or watchdog tree. I'll resend it and let you and Rob figure it out :)

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com