2023-10-21 17:17:14

by Nik Bune

[permalink] [raw]
Subject: [PATCH] dt-bindings: watchdog: davinci-wdt: convert txt to yaml

Convert txt file to yaml.
Add maintainers list. Took from ti,rti-wdt.yaml file.

Signed-off-by: Nik Bune <[email protected]>
---
.../bindings/watchdog/davinci-wdt.txt | 24 ---------
.../bindings/watchdog/ti,davinci-wdt.yaml | 50 +++++++++++++++++++
2 files changed, 50 insertions(+), 24 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
create mode 100644 Documentation/devicetree/bindings/watchdog/ti,davinci-wdt.yaml

diff --git a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
deleted file mode 100644
index aa10b8ec36e2..000000000000
--- a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Texas Instruments DaVinci/Keystone Watchdog Timer (WDT) Controller
-
-Required properties:
-- compatible : Should be "ti,davinci-wdt", "ti,keystone-wdt"
-- reg : Should contain WDT registers location and length
-
-Optional properties:
-- timeout-sec : Contains the watchdog timeout in seconds
-- clocks : the clock feeding the watchdog timer.
- Needed if platform uses clocks.
- See clock-bindings.txt
-
-Documentation:
-Davinci DM646x - https://www.ti.com/lit/ug/spruer5b/spruer5b.pdf
-Keystone - https://www.ti.com/lit/ug/sprugv5a/sprugv5a.pdf
-
-Examples:
-
-wdt: wdt@2320000 {
- compatible = "ti,davinci-wdt";
- reg = <0x02320000 0x80>;
- timeout-sec = <30>;
- clocks = <&clkwdtimer0>;
-};
diff --git a/Documentation/devicetree/bindings/watchdog/ti,davinci-wdt.yaml b/Documentation/devicetree/bindings/watchdog/ti,davinci-wdt.yaml
new file mode 100644
index 000000000000..357c1effff49
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/ti,davinci-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/ti,davinci-wdt.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Texas Instruments DaVinci/Keystone Watchdog Timer (WDT) Controller
+
+description: |
+ Documentation:
+ Davinci DM646x - https://www.ti.com/lit/ug/spruer5b/spruer5b.pdf
+ Keystone - https://www.ti.com/lit/ug/sprugv5a/sprugv5a
+
+maintainers:
+ - Tero Kristo <[email protected]>
+
+allOf:
+ - $ref: watchdog.yaml#
+
+properties:
+ compatible:
+ enum:
+ - ti,davinci-wdt
+ - ti,keystone-wdt
+
+ reg:
+ maxItems: 1
+
+ timeout-sec: true
+
+ clocks:
+ description:
+ the clock feeding the watchdog timer.
+ Needed if platform uses clocks.
+ See clock-bindings.txt
+
+required:
+ - compatible
+ - reg
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ watchdog@2320000 {
+ compatible = "ti,davinci-wdt";
+ reg = <0x02320000 0x80>;
+ timeout-sec = <30>;
+ clocks = <&clkwdtimer0>;
+ };
--
2.34.1


2023-10-23 17:02:31

by Conor Dooley

[permalink] [raw]
Subject: Re: [PATCH] dt-bindings: watchdog: davinci-wdt: convert txt to yaml

I'd swear I replied here already, but I checked on lore and saw
nothing...

On Sat, Oct 21, 2023 at 07:13:23PM +0200, Nik Bune wrote:
> Convert txt file to yaml.
> Add maintainers list. Took from ti,rti-wdt.yaml file.
>
> Signed-off-by: Nik Bune <[email protected]>
> ---
> .../bindings/watchdog/davinci-wdt.txt | 24 ---------
> .../bindings/watchdog/ti,davinci-wdt.yaml | 50 +++++++++++++++++++
> 2 files changed, 50 insertions(+), 24 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
> create mode 100644 Documentation/devicetree/bindings/watchdog/ti,davinci-wdt.yaml
>
> diff --git a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
> deleted file mode 100644
> index aa10b8ec36e2..000000000000
> --- a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -Texas Instruments DaVinci/Keystone Watchdog Timer (WDT) Controller
> -
> -Required properties:
> -- compatible : Should be "ti,davinci-wdt", "ti,keystone-wdt"
> -- reg : Should contain WDT registers location and length
> -
> -Optional properties:
> -- timeout-sec : Contains the watchdog timeout in seconds
> -- clocks : the clock feeding the watchdog timer.
> - Needed if platform uses clocks.
> - See clock-bindings.txt
> -
> -Documentation:
> -Davinci DM646x - https://www.ti.com/lit/ug/spruer5b/spruer5b.pdf
> -Keystone - https://www.ti.com/lit/ug/sprugv5a/sprugv5a.pdf
> -
> -Examples:
> -
> -wdt: wdt@2320000 {
> - compatible = "ti,davinci-wdt";
> - reg = <0x02320000 0x80>;
> - timeout-sec = <30>;
> - clocks = <&clkwdtimer0>;
> -};
> diff --git a/Documentation/devicetree/bindings/watchdog/ti,davinci-wdt.yaml b/Documentation/devicetree/bindings/watchdog/ti,davinci-wdt.yaml
> new file mode 100644
> index 000000000000..357c1effff49
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/watchdog/ti,davinci-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/ti,davinci-wdt.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Texas Instruments DaVinci/Keystone Watchdog Timer (WDT) Controller
> +
> +description: |
> + Documentation:
> + Davinci DM646x - https://www.ti.com/lit/ug/spruer5b/spruer5b.pdf
> + Keystone - https://www.ti.com/lit/ug/sprugv5a/sprugv5a
> +
> +maintainers:
> + - Tero Kristo <[email protected]>
> +
> +allOf:
> + - $ref: watchdog.yaml#
> +
> +properties:
> + compatible:
> + enum:
> + - ti,davinci-wdt
> + - ti,keystone-wdt
> +
> + reg:
> + maxItems: 1
> +

> + timeout-sec: true

Cos of the unevaluatedProperties below, and the reference to
watchdog.yaml, setting timeout-sec: true here is not required.

> +
> + clocks:
> + description:
> + the clock feeding the watchdog timer.
> + Needed if platform uses clocks.
> + See clock-bindings.txt

This can just be

clocks:
maxItems: 1

Although I suspect there are no platforms that do not actually use
clocks, and really this should be required...

Cheers,
Conor.

> +
> +required:
> + - compatible
> + - reg
> +
> +unevaluatedProperties: false
> +
> +examples:
> + - |
> + watchdog@2320000 {
> + compatible = "ti,davinci-wdt";
> + reg = <0x02320000 0x80>;
> + timeout-sec = <30>;
> + clocks = <&clkwdtimer0>;
> + };
> --
> 2.34.1


Attachments:
(No filename) (3.50 kB)
signature.asc (235.00 B)
Download all attachments

2023-10-23 17:12:37

by Krzysztof Kozlowski

[permalink] [raw]
Subject: Re: [PATCH] dt-bindings: watchdog: davinci-wdt: convert txt to yaml

On 23/10/2023 19:02, Conor Dooley wrote:
> I'd swear I replied here already, but I checked on lore and saw
> nothing...

You're almost right:
https://lore.kernel.org/all/[email protected]/
Different binding, but same things to fix. :)


Best regards,
Krzysztof

2023-10-24 19:54:55

by Rob Herring (Arm)

[permalink] [raw]
Subject: Re: [PATCH] dt-bindings: watchdog: davinci-wdt: convert txt to yaml

On Mon, Oct 23, 2023 at 07:12:16PM +0200, Krzysztof Kozlowski wrote:
> On 23/10/2023 19:02, Conor Dooley wrote:
> > I'd swear I replied here already, but I checked on lore and saw
> > nothing...
>
> You're almost right:
> https://lore.kernel.org/all/[email protected]/
> Different binding, but same things to fix. :)

Welcome to the blur of DT maintainership. :)

Rob