Message ID | 20210527100120.266796-1-eugen.hristev@microchip.com |
---|---|
State | Accepted |
Commit | 13b191692d917b62d50c3956ed9c6ef3d0fbb001 |
Headers | show |
Series | [1/3] dt-bindings: watchdog: sama5d4-wdt: convert to yaml | expand |
On Thu, 27 May 2021 13:01:18 +0300, Eugen Hristev wrote: > Convert the old txt binding to yaml format. > > Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com> > --- > .../bindings/watchdog/atmel,sama5d4-wdt.yaml | 73 +++++++++++++++++++ > .../bindings/watchdog/atmel-sama5d4-wdt.txt | 34 --------- > 2 files changed, 73 insertions(+), 34 deletions(-) > create mode 100644 Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml > delete mode 100644 Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt > Reviewed-by: Rob Herring <robh@kernel.org>
On 27/05/2021 at 12:01, Eugen Hristev wrote: > Convert the old txt binding to yaml format. > > Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com> Series queued on at91-dt for 5.14. Will be sent to arm-soc soon. Thanks, best regards, Nicolas > --- > .../bindings/watchdog/atmel,sama5d4-wdt.yaml | 73 +++++++++++++++++++ > .../bindings/watchdog/atmel-sama5d4-wdt.txt | 34 --------- > 2 files changed, 73 insertions(+), 34 deletions(-) > create mode 100644 Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml > delete mode 100644 Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt > > diff --git a/Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml b/Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml > new file mode 100644 > index 000000000000..0d0ab81da040 > --- /dev/null > +++ b/Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml > @@ -0,0 +1,73 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/watchdog/atmel,sama5d4-wdt.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Atmel SAMA5D4 Watchdog Timer (WDT) Controller > + > +maintainers: > + - Eugen Hristev <eugen.hristev@microchip.com> > + > +allOf: > + - $ref: "watchdog.yaml#" > + > +properties: > + compatible: > + enum: > + - atmel,sama5d4-wdt > + - microchip,sam9x60-wdt > + > + reg: > + maxItems: 1 > + > + atmel,watchdog-type: > + $ref: /schemas/types.yaml#/definitions/string > + description: should be hardware or software. > + oneOf: > + - description: > + Enable watchdog fault reset. A watchdog fault triggers > + watchdog reset. > + const: hardware > + - description: > + Enable watchdog fault interrupt. A watchdog fault asserts > + watchdog interrupt. > + const: software > + default: hardware > + > + atmel,idle-halt: > + $ref: /schemas/types.yaml#/definitions/flag > + description: | > + present if you want to stop the watchdog when the CPU is in idle state. > + CAUTION: This property should be used with care, it actually makes the > + watchdog not counting when the CPU is in idle state, therefore the > + watchdog reset time depends on mean CPU usage and will not reset at all > + if the CPU stop working while it is in idle state, which is probably > + not what you want. > + > + atmel,dbg-halt: > + $ref: /schemas/types.yaml#/definitions/flag > + description: | > + present if you want to stop the watchdog when the CPU is in debug state. > + > +required: > + - compatible > + - reg > + > +unevaluatedProperties: false > + > +examples: > + - | > + #include <dt-bindings/interrupt-controller/irq.h> > + > + watchdog@fc068640 { > + compatible = "atmel,sama5d4-wdt"; > + reg = <0xfc068640 0x10>; > + interrupts = <4 IRQ_TYPE_LEVEL_HIGH 5>; > + timeout-sec = <10>; > + atmel,watchdog-type = "hardware"; > + atmel,dbg-halt; > + atmel,idle-halt; > + }; > + > +... > diff --git a/Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt b/Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt > deleted file mode 100644 > index 44727fcc2729..000000000000 > --- a/Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt > +++ /dev/null > @@ -1,34 +0,0 @@ > -* Atmel SAMA5D4 Watchdog Timer (WDT) Controller > - > -Required properties: > -- compatible: "atmel,sama5d4-wdt" or "microchip,sam9x60-wdt" > -- reg: base physical address and length of memory mapped region. > - > -Optional properties: > -- timeout-sec: watchdog timeout value (in seconds). > -- interrupts: interrupt number to the CPU. > -- atmel,watchdog-type: should be "hardware" or "software". > - "hardware": enable watchdog fault reset. A watchdog fault triggers > - watchdog reset. > - "software": enable watchdog fault interrupt. A watchdog fault asserts > - watchdog interrupt. > -- atmel,idle-halt: present if you want to stop the watchdog when the CPU is > - in idle state. > - CAUTION: This property should be used with care, it actually makes the > - watchdog not counting when the CPU is in idle state, therefore the > - watchdog reset time depends on mean CPU usage and will not reset at all > - if the CPU stop working while it is in idle state, which is probably > - not what you want. > -- atmel,dbg-halt: present if you want to stop the watchdog when the CPU is > - in debug state. > - > -Example: > - watchdog@fc068640 { > - compatible = "atmel,sama5d4-wdt"; > - reg = <0xfc068640 0x10>; > - interrupts = <4 IRQ_TYPE_LEVEL_HIGH 5>; > - timeout-sec = <10>; > - atmel,watchdog-type = "hardware"; > - atmel,dbg-halt; > - atmel,idle-halt; > - }; > -- Nicolas Ferre
On 06/06/2021 at 18:52, Nicolas Ferre wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > On 27/05/2021 at 12:01, Eugen Hristev wrote: >> Convert the old txt binding to yaml format. >> >> Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com> > > Series queued on at91-dt for 5.14. Will be sent to arm-soc soon. Please ignore this comment which has no meaning as all the content of this series must progress with the "watchdog" tree and not at91->arm-soc! Sorry for the noise and confusion. I'm removing the patches from at91-dt right now. Best regards, Nicolas >> --- >> .../bindings/watchdog/atmel,sama5d4-wdt.yaml | 73 +++++++++++++++++++ >> .../bindings/watchdog/atmel-sama5d4-wdt.txt | 34 --------- >> 2 files changed, 73 insertions(+), 34 deletions(-) >> create mode 100644 Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml >> delete mode 100644 Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt >> >> diff --git a/Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml b/Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml >> new file mode 100644 >> index 000000000000..0d0ab81da040 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml >> @@ -0,0 +1,73 @@ >> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) >> +%YAML 1.2 >> +--- >> +$id: http://devicetree.org/schemas/watchdog/atmel,sama5d4-wdt.yaml# >> +$schema: http://devicetree.org/meta-schemas/core.yaml# >> + >> +title: Atmel SAMA5D4 Watchdog Timer (WDT) Controller >> + >> +maintainers: >> + - Eugen Hristev <eugen.hristev@microchip.com> >> + >> +allOf: >> + - $ref: "watchdog.yaml#" >> + >> +properties: >> + compatible: >> + enum: >> + - atmel,sama5d4-wdt >> + - microchip,sam9x60-wdt >> + >> + reg: >> + maxItems: 1 >> + >> + atmel,watchdog-type: >> + $ref: /schemas/types.yaml#/definitions/string >> + description: should be hardware or software. >> + oneOf: >> + - description: >> + Enable watchdog fault reset. A watchdog fault triggers >> + watchdog reset. >> + const: hardware >> + - description: >> + Enable watchdog fault interrupt. A watchdog fault asserts >> + watchdog interrupt. >> + const: software >> + default: hardware >> + >> + atmel,idle-halt: >> + $ref: /schemas/types.yaml#/definitions/flag >> + description: | >> + present if you want to stop the watchdog when the CPU is in idle state. >> + CAUTION: This property should be used with care, it actually makes the >> + watchdog not counting when the CPU is in idle state, therefore the >> + watchdog reset time depends on mean CPU usage and will not reset at all >> + if the CPU stop working while it is in idle state, which is probably >> + not what you want. >> + >> + atmel,dbg-halt: >> + $ref: /schemas/types.yaml#/definitions/flag >> + description: | >> + present if you want to stop the watchdog when the CPU is in debug state. >> + >> +required: >> + - compatible >> + - reg >> + >> +unevaluatedProperties: false >> + >> +examples: >> + - | >> + #include <dt-bindings/interrupt-controller/irq.h> >> + >> + watchdog@fc068640 { >> + compatible = "atmel,sama5d4-wdt"; >> + reg = <0xfc068640 0x10>; >> + interrupts = <4 IRQ_TYPE_LEVEL_HIGH 5>; >> + timeout-sec = <10>; >> + atmel,watchdog-type = "hardware"; >> + atmel,dbg-halt; >> + atmel,idle-halt; >> + }; >> + >> +... >> diff --git a/Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt b/Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt >> deleted file mode 100644 >> index 44727fcc2729..000000000000 >> --- a/Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt >> +++ /dev/null >> @@ -1,34 +0,0 @@ >> -* Atmel SAMA5D4 Watchdog Timer (WDT) Controller >> - >> -Required properties: >> -- compatible: "atmel,sama5d4-wdt" or "microchip,sam9x60-wdt" >> -- reg: base physical address and length of memory mapped region. >> - >> -Optional properties: >> -- timeout-sec: watchdog timeout value (in seconds). >> -- interrupts: interrupt number to the CPU. >> -- atmel,watchdog-type: should be "hardware" or "software". >> - "hardware": enable watchdog fault reset. A watchdog fault triggers >> - watchdog reset. >> - "software": enable watchdog fault interrupt. A watchdog fault asserts >> - watchdog interrupt. >> -- atmel,idle-halt: present if you want to stop the watchdog when the CPU is >> - in idle state. >> - CAUTION: This property should be used with care, it actually makes the >> - watchdog not counting when the CPU is in idle state, therefore the >> - watchdog reset time depends on mean CPU usage and will not reset at all >> - if the CPU stop working while it is in idle state, which is probably >> - not what you want. >> -- atmel,dbg-halt: present if you want to stop the watchdog when the CPU is >> - in debug state. >> - >> -Example: >> - watchdog@fc068640 { >> - compatible = "atmel,sama5d4-wdt"; >> - reg = <0xfc068640 0x10>; >> - interrupts = <4 IRQ_TYPE_LEVEL_HIGH 5>; >> - timeout-sec = <10>; >> - atmel,watchdog-type = "hardware"; >> - atmel,dbg-halt; >> - atmel,idle-halt; >> - }; >> > > > -- > Nicolas Ferre > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > -- Nicolas Ferre
diff --git a/Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml b/Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml new file mode 100644 index 000000000000..0d0ab81da040 --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml @@ -0,0 +1,73 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/watchdog/atmel,sama5d4-wdt.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Atmel SAMA5D4 Watchdog Timer (WDT) Controller + +maintainers: + - Eugen Hristev <eugen.hristev@microchip.com> + +allOf: + - $ref: "watchdog.yaml#" + +properties: + compatible: + enum: + - atmel,sama5d4-wdt + - microchip,sam9x60-wdt + + reg: + maxItems: 1 + + atmel,watchdog-type: + $ref: /schemas/types.yaml#/definitions/string + description: should be hardware or software. + oneOf: + - description: + Enable watchdog fault reset. A watchdog fault triggers + watchdog reset. + const: hardware + - description: + Enable watchdog fault interrupt. A watchdog fault asserts + watchdog interrupt. + const: software + default: hardware + + atmel,idle-halt: + $ref: /schemas/types.yaml#/definitions/flag + description: | + present if you want to stop the watchdog when the CPU is in idle state. + CAUTION: This property should be used with care, it actually makes the + watchdog not counting when the CPU is in idle state, therefore the + watchdog reset time depends on mean CPU usage and will not reset at all + if the CPU stop working while it is in idle state, which is probably + not what you want. + + atmel,dbg-halt: + $ref: /schemas/types.yaml#/definitions/flag + description: | + present if you want to stop the watchdog when the CPU is in debug state. + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/irq.h> + + watchdog@fc068640 { + compatible = "atmel,sama5d4-wdt"; + reg = <0xfc068640 0x10>; + interrupts = <4 IRQ_TYPE_LEVEL_HIGH 5>; + timeout-sec = <10>; + atmel,watchdog-type = "hardware"; + atmel,dbg-halt; + atmel,idle-halt; + }; + +... diff --git a/Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt b/Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt deleted file mode 100644 index 44727fcc2729..000000000000 --- a/Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt +++ /dev/null @@ -1,34 +0,0 @@ -* Atmel SAMA5D4 Watchdog Timer (WDT) Controller - -Required properties: -- compatible: "atmel,sama5d4-wdt" or "microchip,sam9x60-wdt" -- reg: base physical address and length of memory mapped region. - -Optional properties: -- timeout-sec: watchdog timeout value (in seconds). -- interrupts: interrupt number to the CPU. -- atmel,watchdog-type: should be "hardware" or "software". - "hardware": enable watchdog fault reset. A watchdog fault triggers - watchdog reset. - "software": enable watchdog fault interrupt. A watchdog fault asserts - watchdog interrupt. -- atmel,idle-halt: present if you want to stop the watchdog when the CPU is - in idle state. - CAUTION: This property should be used with care, it actually makes the - watchdog not counting when the CPU is in idle state, therefore the - watchdog reset time depends on mean CPU usage and will not reset at all - if the CPU stop working while it is in idle state, which is probably - not what you want. -- atmel,dbg-halt: present if you want to stop the watchdog when the CPU is - in debug state. - -Example: - watchdog@fc068640 { - compatible = "atmel,sama5d4-wdt"; - reg = <0xfc068640 0x10>; - interrupts = <4 IRQ_TYPE_LEVEL_HIGH 5>; - timeout-sec = <10>; - atmel,watchdog-type = "hardware"; - atmel,dbg-halt; - atmel,idle-halt; - };
Convert the old txt binding to yaml format. Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com> --- .../bindings/watchdog/atmel,sama5d4-wdt.yaml | 73 +++++++++++++++++++ .../bindings/watchdog/atmel-sama5d4-wdt.txt | 34 --------- 2 files changed, 73 insertions(+), 34 deletions(-) create mode 100644 Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml delete mode 100644 Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt