2021-05-27 15:18:50

by Eugen Hristev

[permalink] [raw]
Subject: [PATCH 1/3] dt-bindings: watchdog: sama5d4-wdt: convert to yaml

Convert the old txt binding to yaml format.

Signed-off-by: Eugen Hristev <[email protected]>
---
.../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 <[email protected]>
+
+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>
+
+ [email protected] {
+ 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:
- [email protected] {
- 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;
- };
--
2.25.1


2021-05-27 15:20:10

by Eugen Hristev

[permalink] [raw]
Subject: [PATCH 2/3] watchdog: sama5d4_wdt: add support for sama7g5-wdt

Add support for compatible sama7g5-wdt.
The sama7g5 wdt is the same hardware block as on sam9x60.
Adapt the driver to use the sam9x60/sama7g5 variant if either
of the two compatibles are selected (sam9x60-wdt/sama7g5-wdt).

Signed-off-by: Eugen Hristev <[email protected]>
---
drivers/watchdog/sama5d4_wdt.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c
index e5d11d6a2600..ec20ad4e534f 100644
--- a/drivers/watchdog/sama5d4_wdt.c
+++ b/drivers/watchdog/sama5d4_wdt.c
@@ -268,8 +268,10 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
wdd->min_timeout = MIN_WDT_TIMEOUT;
wdd->max_timeout = MAX_WDT_TIMEOUT;
wdt->last_ping = jiffies;
- wdt->sam9x60_support = of_device_is_compatible(dev->of_node,
- "microchip,sam9x60-wdt");
+
+ if (of_device_is_compatible(dev->of_node, "microchip,sam9x60-wdt") ||
+ of_device_is_compatible(dev->of_node, "microchip,sama7g5-wdt"))
+ wdt->sam9x60_support = true;

watchdog_set_drvdata(wdd, wdt);

@@ -329,6 +331,10 @@ static const struct of_device_id sama5d4_wdt_of_match[] = {
{
.compatible = "microchip,sam9x60-wdt",
},
+ {
+ .compatible = "microchip,sama7g5-wdt",
+ },
+
{ }
};
MODULE_DEVICE_TABLE(of, sama5d4_wdt_of_match);
--
2.25.1

2021-05-27 15:43:02

by Eugen Hristev

[permalink] [raw]
Subject: [PATCH 3/3] dt-bindings: watchdog: sama5d4-wdt: add compatible for sama7g5-wdt

This driver is also compatible with the watchdog on sama7g5 SoC.
Add the corresponding compatible string to the binding.

Signed-off-by: Eugen Hristev <[email protected]>
---
.../devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml | 1 +
1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml b/Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml
index 0d0ab81da040..9856cd76c28d 100644
--- a/Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml
@@ -17,6 +17,7 @@ properties:
enum:
- atmel,sama5d4-wdt
- microchip,sam9x60-wdt
+ - microchip,sama7g5-wdt

reg:
maxItems: 1
--
2.25.1

2021-05-27 19:00:06

by Guenter Roeck

[permalink] [raw]
Subject: Re: [PATCH 2/3] watchdog: sama5d4_wdt: add support for sama7g5-wdt

On Thu, May 27, 2021 at 01:01:19PM +0300, Eugen Hristev wrote:
> Add support for compatible sama7g5-wdt.
> The sama7g5 wdt is the same hardware block as on sam9x60.
> Adapt the driver to use the sam9x60/sama7g5 variant if either
> of the two compatibles are selected (sam9x60-wdt/sama7g5-wdt).
>
> Signed-off-by: Eugen Hristev <[email protected]>

Reviewed-by: Guenter Roeck <[email protected]>

> ---
> drivers/watchdog/sama5d4_wdt.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c
> index e5d11d6a2600..ec20ad4e534f 100644
> --- a/drivers/watchdog/sama5d4_wdt.c
> +++ b/drivers/watchdog/sama5d4_wdt.c
> @@ -268,8 +268,10 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
> wdd->min_timeout = MIN_WDT_TIMEOUT;
> wdd->max_timeout = MAX_WDT_TIMEOUT;
> wdt->last_ping = jiffies;
> - wdt->sam9x60_support = of_device_is_compatible(dev->of_node,
> - "microchip,sam9x60-wdt");
> +
> + if (of_device_is_compatible(dev->of_node, "microchip,sam9x60-wdt") ||
> + of_device_is_compatible(dev->of_node, "microchip,sama7g5-wdt"))
> + wdt->sam9x60_support = true;
>
> watchdog_set_drvdata(wdd, wdt);
>
> @@ -329,6 +331,10 @@ static const struct of_device_id sama5d4_wdt_of_match[] = {
> {
> .compatible = "microchip,sam9x60-wdt",
> },
> + {
> + .compatible = "microchip,sama7g5-wdt",
> + },
> +
> { }
> };
> MODULE_DEVICE_TABLE(of, sama5d4_wdt_of_match);
> --
> 2.25.1
>

2021-06-04 20:21:51

by Rob Herring

[permalink] [raw]
Subject: Re: [PATCH 1/3] dt-bindings: watchdog: sama5d4-wdt: convert to yaml

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 <[email protected]>
> ---
> .../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 <[email protected]>

2021-06-04 20:22:38

by Rob Herring

[permalink] [raw]
Subject: Re: [PATCH 3/3] dt-bindings: watchdog: sama5d4-wdt: add compatible for sama7g5-wdt

On Thu, 27 May 2021 13:01:20 +0300, Eugen Hristev wrote:
> This driver is also compatible with the watchdog on sama7g5 SoC.
> Add the corresponding compatible string to the binding.
>
> Signed-off-by: Eugen Hristev <[email protected]>
> ---
> .../devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml | 1 +
> 1 file changed, 1 insertion(+)
>

Reviewed-by: Rob Herring <[email protected]>

2021-06-06 16:57:54

by Nicolas Ferre

[permalink] [raw]
Subject: Re: [PATCH 1/3] dt-bindings: watchdog: sama5d4-wdt: convert to yaml

On 27/05/2021 at 12:01, Eugen Hristev wrote:
> Convert the old txt binding to yaml format.
>
> Signed-off-by: Eugen Hristev <[email protected]>

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 <[email protected]>
> +
> +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>
> +
> + [email protected] {
> + 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:
> - [email protected] {
> - 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

2021-06-11 10:38:20

by Guenter Roeck

[permalink] [raw]
Subject: Re: [PATCH 2/3] watchdog: sama5d4_wdt: add support for sama7g5-wdt

On Fri, Jun 11, 2021 at 09:19:56AM +0200, Nicolas Ferre wrote:
> On 27/05/2021 at 18:55, Guenter Roeck wrote:
> > On Thu, May 27, 2021 at 01:01:19PM +0300, Eugen Hristev wrote:
> > > Add support for compatible sama7g5-wdt.
> > > The sama7g5 wdt is the same hardware block as on sam9x60.
> > > Adapt the driver to use the sam9x60/sama7g5 variant if either
> > > of the two compatibles are selected (sam9x60-wdt/sama7g5-wdt).
> > >
> > > Signed-off-by: Eugen Hristev <[email protected]>
> >
> > Reviewed-by: Guenter Roeck <[email protected]>
>
> Guenter, Wim,
>
> How do we proceed? Do I take this "driver" patch through my tree which goes
> to arm-soc or do you take it with the watchdog tree?

I applied the series to my watchdog-next branch. That is all I can do
from my side.

Guenter

>
> I'm planning to send my pull-requests before the end of this week.
>
> Best regards,
> Nicolas
>
> > > ---
> > > drivers/watchdog/sama5d4_wdt.c | 10 ++++++++--
> > > 1 file changed, 8 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c
> > > index e5d11d6a2600..ec20ad4e534f 100644
> > > --- a/drivers/watchdog/sama5d4_wdt.c
> > > +++ b/drivers/watchdog/sama5d4_wdt.c
> > > @@ -268,8 +268,10 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
> > > wdd->min_timeout = MIN_WDT_TIMEOUT;
> > > wdd->max_timeout = MAX_WDT_TIMEOUT;
> > > wdt->last_ping = jiffies;
> > > - wdt->sam9x60_support = of_device_is_compatible(dev->of_node,
> > > - "microchip,sam9x60-wdt");
> > > +
> > > + if (of_device_is_compatible(dev->of_node, "microchip,sam9x60-wdt") ||
> > > + of_device_is_compatible(dev->of_node, "microchip,sama7g5-wdt"))
> > > + wdt->sam9x60_support = true;
> > >
> > > watchdog_set_drvdata(wdd, wdt);
> > >
> > > @@ -329,6 +331,10 @@ static const struct of_device_id sama5d4_wdt_of_match[] = {
> > > {
> > > .compatible = "microchip,sam9x60-wdt",
> > > },
> > > + {
> > > + .compatible = "microchip,sama7g5-wdt",
> > > + },
> > > +
> > > { }
> > > };
> > > MODULE_DEVICE_TABLE(of, sama5d4_wdt_of_match);
> > > --
> > > 2.25.1
> > >
>
>
> --
> Nicolas Ferre

2021-06-11 12:21:15

by Nicolas Ferre

[permalink] [raw]
Subject: Re: [PATCH 1/3] dt-bindings: watchdog: sama5d4-wdt: convert to yaml

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 <[email protected]>
>
> 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 <[email protected]>
>> +
>> +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>
>> +
>> + [email protected] {
>> + 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:
>> - [email protected] {
>> - 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
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>


--
Nicolas Ferre