Message ID | 20230302085914.2858645-1-sergio.paracuellos@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
Series | [v3] dt-bindings: watchdog: migrate rt2880 text bindings to YAML | expand |
On 02/03/2023 09:59, Sergio Paracuellos wrote: > Ralink RT2880 Watchdog bindings used text format, so migrate them to YAML. > There are some additions to the binding that were not in the original > txt file. This binding is used in RT2880, RT3050, RT3352, RT3883, RT5350, > and MT7620 SoCs. To properly align binding with driver code we need to add > to the schema 'clocks' and 'resets' properties. > > Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com> > --- > Changes in v3: > - Re-do commit message. > - add 'clocks' property and update example using it. > - drop 'reset-names'. > - Use 'unevaluatedProperties' instead of 'additionalProperties'. > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
On Thu, Mar 02, 2023 at 09:59:14AM +0100, Sergio Paracuellos wrote: > Ralink RT2880 Watchdog bindings used text format, so migrate them to YAML. > There are some additions to the binding that were not in the original > txt file. This binding is used in RT2880, RT3050, RT3352, RT3883, RT5350, > and MT7620 SoCs. To properly align binding with driver code we need to add > to the schema 'clocks' and 'resets' properties. > > Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com> > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > Changes in v3: > - Re-do commit message. > - add 'clocks' property and update example using it. > - drop 'reset-names'. > - Use 'unevaluatedProperties' instead of 'additionalProperties'. > > Changes in v2: > - Fix reg address and size in example. > > .../bindings/watchdog/ralink,rt2880-wdt.yaml | 46 +++++++++++++++++++ > .../bindings/watchdog/rt2880-wdt.txt | 18 -------- > 2 files changed, 46 insertions(+), 18 deletions(-) > create mode 100644 Documentation/devicetree/bindings/watchdog/ralink,rt2880-wdt.yaml > delete mode 100644 Documentation/devicetree/bindings/watchdog/rt2880-wdt.txt > > diff --git a/Documentation/devicetree/bindings/watchdog/ralink,rt2880-wdt.yaml b/Documentation/devicetree/bindings/watchdog/ralink,rt2880-wdt.yaml > new file mode 100644 > index 000000000000..51e00de947e9 > --- /dev/null > +++ b/Documentation/devicetree/bindings/watchdog/ralink,rt2880-wdt.yaml > @@ -0,0 +1,46 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/watchdog/ralink,rt2880-wdt.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Ralink Watchdog Timers > + > +maintainers: > + - Sergio Paracuellos <sergio.paracuellos@gmail.com> > + > +allOf: > + - $ref: watchdog.yaml# > + > +properties: > + compatible: > + const: ralink,rt2880-wdt > + > + reg: > + maxItems: 1 > + > + clocks: > + maxItems: 1 > + > + resets: > + maxItems: 1 > + > + interrupts: > + maxItems: 1 > + > +required: > + - compatible > + - reg > + > +unevaluatedProperties: false > + > +examples: > + - | > + watchdog@100 { > + compatible = "ralink,rt2880-wdt"; > + reg = <0x120 0x10>; > + clocks = <&clkref>; > + resets = <&rstctrl 8>; > + interrupt-parent = <&intc>; > + interrupts = <1>; > + }; > diff --git a/Documentation/devicetree/bindings/watchdog/rt2880-wdt.txt b/Documentation/devicetree/bindings/watchdog/rt2880-wdt.txt > deleted file mode 100644 > index 05b95bfa2a89..000000000000 > --- a/Documentation/devicetree/bindings/watchdog/rt2880-wdt.txt > +++ /dev/null > @@ -1,18 +0,0 @@ > -Ralink Watchdog Timers > - > -Required properties: > -- compatible: must be "ralink,rt2880-wdt" > -- reg: physical base address of the controller and length of the register range > - > -Optional properties: > -- interrupts: Specify the INTC interrupt number > - > -Example: > - > - watchdog@120 { > - compatible = "ralink,rt2880-wdt"; > - reg = <0x120 0x10>; > - > - interrupt-parent = <&intc>; > - interrupts = <1>; > - };
diff --git a/Documentation/devicetree/bindings/watchdog/ralink,rt2880-wdt.yaml b/Documentation/devicetree/bindings/watchdog/ralink,rt2880-wdt.yaml new file mode 100644 index 000000000000..51e00de947e9 --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/ralink,rt2880-wdt.yaml @@ -0,0 +1,46 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/watchdog/ralink,rt2880-wdt.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Ralink Watchdog Timers + +maintainers: + - Sergio Paracuellos <sergio.paracuellos@gmail.com> + +allOf: + - $ref: watchdog.yaml# + +properties: + compatible: + const: ralink,rt2880-wdt + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + + resets: + maxItems: 1 + + interrupts: + maxItems: 1 + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + watchdog@100 { + compatible = "ralink,rt2880-wdt"; + reg = <0x120 0x10>; + clocks = <&clkref>; + resets = <&rstctrl 8>; + interrupt-parent = <&intc>; + interrupts = <1>; + }; diff --git a/Documentation/devicetree/bindings/watchdog/rt2880-wdt.txt b/Documentation/devicetree/bindings/watchdog/rt2880-wdt.txt deleted file mode 100644 index 05b95bfa2a89..000000000000 --- a/Documentation/devicetree/bindings/watchdog/rt2880-wdt.txt +++ /dev/null @@ -1,18 +0,0 @@ -Ralink Watchdog Timers - -Required properties: -- compatible: must be "ralink,rt2880-wdt" -- reg: physical base address of the controller and length of the register range - -Optional properties: -- interrupts: Specify the INTC interrupt number - -Example: - - watchdog@120 { - compatible = "ralink,rt2880-wdt"; - reg = <0x120 0x10>; - - interrupt-parent = <&intc>; - interrupts = <1>; - };
Ralink RT2880 Watchdog bindings used text format, so migrate them to YAML. There are some additions to the binding that were not in the original txt file. This binding is used in RT2880, RT3050, RT3352, RT3883, RT5350, and MT7620 SoCs. To properly align binding with driver code we need to add to the schema 'clocks' and 'resets' properties. Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com> --- Changes in v3: - Re-do commit message. - add 'clocks' property and update example using it. - drop 'reset-names'. - Use 'unevaluatedProperties' instead of 'additionalProperties'. Changes in v2: - Fix reg address and size in example. .../bindings/watchdog/ralink,rt2880-wdt.yaml | 46 +++++++++++++++++++ .../bindings/watchdog/rt2880-wdt.txt | 18 -------- 2 files changed, 46 insertions(+), 18 deletions(-) create mode 100644 Documentation/devicetree/bindings/watchdog/ralink,rt2880-wdt.yaml delete mode 100644 Documentation/devicetree/bindings/watchdog/rt2880-wdt.txt