.../bindings/watchdog/armada-37xx-wdt.txt | 23 ----------- .../watchdog/marvell,armada-3700-wdt.yaml | 41 +++++++++++++++++++ MAINTAINERS | 2 +- 3 files changed, 42 insertions(+), 24 deletions(-) delete mode 100644 Documentation/devicetree/bindings/watchdog/armada-37xx-wdt.txt create mode 100644 Documentation/devicetree/bindings/watchdog/marvell,armada-3700-wdt.yaml
Convert the Marvell Armada 3700 watchdog binding to DT schema format.
It's a straight-forward conversion.
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
.../bindings/watchdog/armada-37xx-wdt.txt | 23 -----------
.../watchdog/marvell,armada-3700-wdt.yaml | 41 +++++++++++++++++++
MAINTAINERS | 2 +-
3 files changed, 42 insertions(+), 24 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/watchdog/armada-37xx-wdt.txt
create mode 100644 Documentation/devicetree/bindings/watchdog/marvell,armada-3700-wdt.yaml
diff --git a/Documentation/devicetree/bindings/watchdog/armada-37xx-wdt.txt b/Documentation/devicetree/bindings/watchdog/armada-37xx-wdt.txt
deleted file mode 100644
index a8d00c31a1d8..000000000000
--- a/Documentation/devicetree/bindings/watchdog/armada-37xx-wdt.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-* Armada 37xx CPU Watchdog Timer Controller
-
-Required properties:
-- compatible : must be "marvell,armada-3700-wdt"
-- reg : base physical address of the controller and length of memory mapped
- region.
-- clocks : the clock feeding the watchdog timer. See clock-bindings.txt
-- marvell,system-controller : reference to syscon node for the CPU Miscellaneous
- Registers
-
-Example:
-
- cpu_misc: system-controller@d000 {
- compatible = "marvell,armada-3700-cpu-misc", "syscon";
- reg = <0xd000 0x1000>;
- };
-
- wdt: watchdog@8300 {
- compatible = "marvell,armada-3700-wdt";
- reg = <0x8300 0x40>;
- marvell,system-controller = <&cpu_misc>;
- clocks = <&xtalclk>;
- };
diff --git a/Documentation/devicetree/bindings/watchdog/marvell,armada-3700-wdt.yaml b/Documentation/devicetree/bindings/watchdog/marvell,armada-3700-wdt.yaml
new file mode 100644
index 000000000000..60d44d642fb5
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/marvell,armada-3700-wdt.yaml
@@ -0,0 +1,41 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/watchdog/marvell,armada-3700-wdt.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Armada 37xx CPU Watchdog Timer Controller
+
+maintainers:
+ - Marek Behún <kabel@kernel.org>
+
+properties:
+ compatible:
+ const: marvell,armada-3700-wdt
+
+ reg:
+ maxItems: 1
+
+ clocks:
+ maxItems: 1
+
+ marvell,system-controller:
+ description: Reference to syscon node for the CPU Miscellaneous Registers
+ $ref: /schemas/types.yaml#/definitions/phandle
+
+required:
+ - compatible
+ - reg
+ - clocks
+ - marvell,system-controller
+
+additionalProperties: false
+
+examples:
+ - |
+ watchdog@8300 {
+ compatible = "marvell,armada-3700-wdt";
+ reg = <0x8300 0x40>;
+ marvell,system-controller = <&cpu_misc>;
+ clocks = <&xtalclk>;
+ };
diff --git a/MAINTAINERS b/MAINTAINERS
index 06a4cde222bd..6a2de9638c08 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2623,7 +2623,7 @@ F: Documentation/devicetree/bindings/firmware/cznic,turris-mox-rwtm.txt
F: Documentation/devicetree/bindings/firmware/cznic,turris-omnia-mcu.yaml
F: Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml
F: Documentation/devicetree/bindings/leds/cznic,turris-omnia-leds.yaml
-F: Documentation/devicetree/bindings/watchdog/armada-37xx-wdt.txt
+F: Documentation/devicetree/bindings/watchdog/marvell,armada-3700-wdt.yaml
F: drivers/bus/moxtet.c
F: drivers/firmware/turris-mox-rwtm.c
F: drivers/gpio/gpio-moxtet.c
--
2.47.2
On Tue, 12 Aug 2025 15:32:57 -0500, Rob Herring (Arm) wrote: > Convert the Marvell Armada 3700 watchdog binding to DT schema format. > It's a straight-forward conversion. > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org> > --- > .../bindings/watchdog/armada-37xx-wdt.txt | 23 ----------- > .../watchdog/marvell,armada-3700-wdt.yaml | 41 +++++++++++++++++++ > MAINTAINERS | 2 +- > 3 files changed, 42 insertions(+), 24 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/watchdog/armada-37xx-wdt.txt > create mode 100644 Documentation/devicetree/bindings/watchdog/marvell,armada-3700-wdt.yaml > Applied, thanks!
On 8/12/25 13:32, Rob Herring (Arm) wrote: > Convert the Marvell Armada 3700 watchdog binding to DT schema format. > It's a straight-forward conversion. > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org> Acked-by: Guenter Roeck <linux@roeck-us.net> > --- > .../bindings/watchdog/armada-37xx-wdt.txt | 23 ----------- > .../watchdog/marvell,armada-3700-wdt.yaml | 41 +++++++++++++++++++ > MAINTAINERS | 2 +- > 3 files changed, 42 insertions(+), 24 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/watchdog/armada-37xx-wdt.txt > create mode 100644 Documentation/devicetree/bindings/watchdog/marvell,armada-3700-wdt.yaml > > diff --git a/Documentation/devicetree/bindings/watchdog/armada-37xx-wdt.txt b/Documentation/devicetree/bindings/watchdog/armada-37xx-wdt.txt > deleted file mode 100644 > index a8d00c31a1d8..000000000000 > --- a/Documentation/devicetree/bindings/watchdog/armada-37xx-wdt.txt > +++ /dev/null > @@ -1,23 +0,0 @@ > -* Armada 37xx CPU Watchdog Timer Controller > - > -Required properties: > -- compatible : must be "marvell,armada-3700-wdt" > -- reg : base physical address of the controller and length of memory mapped > - region. > -- clocks : the clock feeding the watchdog timer. See clock-bindings.txt > -- marvell,system-controller : reference to syscon node for the CPU Miscellaneous > - Registers > - > -Example: > - > - cpu_misc: system-controller@d000 { > - compatible = "marvell,armada-3700-cpu-misc", "syscon"; > - reg = <0xd000 0x1000>; > - }; > - > - wdt: watchdog@8300 { > - compatible = "marvell,armada-3700-wdt"; > - reg = <0x8300 0x40>; > - marvell,system-controller = <&cpu_misc>; > - clocks = <&xtalclk>; > - }; > diff --git a/Documentation/devicetree/bindings/watchdog/marvell,armada-3700-wdt.yaml b/Documentation/devicetree/bindings/watchdog/marvell,armada-3700-wdt.yaml > new file mode 100644 > index 000000000000..60d44d642fb5 > --- /dev/null > +++ b/Documentation/devicetree/bindings/watchdog/marvell,armada-3700-wdt.yaml > @@ -0,0 +1,41 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/watchdog/marvell,armada-3700-wdt.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Armada 37xx CPU Watchdog Timer Controller > + > +maintainers: > + - Marek Behún <kabel@kernel.org> > + > +properties: > + compatible: > + const: marvell,armada-3700-wdt > + > + reg: > + maxItems: 1 > + > + clocks: > + maxItems: 1 > + > + marvell,system-controller: > + description: Reference to syscon node for the CPU Miscellaneous Registers > + $ref: /schemas/types.yaml#/definitions/phandle > + > +required: > + - compatible > + - reg > + - clocks > + - marvell,system-controller > + > +additionalProperties: false > + > +examples: > + - | > + watchdog@8300 { > + compatible = "marvell,armada-3700-wdt"; > + reg = <0x8300 0x40>; > + marvell,system-controller = <&cpu_misc>; > + clocks = <&xtalclk>; > + }; > diff --git a/MAINTAINERS b/MAINTAINERS > index 06a4cde222bd..6a2de9638c08 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -2623,7 +2623,7 @@ F: Documentation/devicetree/bindings/firmware/cznic,turris-mox-rwtm.txt > F: Documentation/devicetree/bindings/firmware/cznic,turris-omnia-mcu.yaml > F: Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml > F: Documentation/devicetree/bindings/leds/cznic,turris-omnia-leds.yaml > -F: Documentation/devicetree/bindings/watchdog/armada-37xx-wdt.txt > +F: Documentation/devicetree/bindings/watchdog/marvell,armada-3700-wdt.yaml > F: drivers/bus/moxtet.c > F: drivers/firmware/turris-mox-rwtm.c > F: drivers/gpio/gpio-moxtet.c
© 2016 - 2025 Red Hat, Inc.