* [PATCH v2 3/4] ARM: at91/dt: add sam9 watchdog default options to SoCs
[not found] <1371799176-3408-1-git-send-email-b.brezillon@overkiz.com>
@ 2013-06-21 7:29 ` Boris BREZILLON
2013-06-21 7:31 ` Boris BREZILLON
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Boris BREZILLON @ 2013-06-21 7:29 UTC (permalink / raw)
To: linux-arm-kernel
Set default watchdog options in every SoC compatible with the sam9 watchdog.
Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
---
arch/arm/boot/dts/at91sam9260.dtsi | 5 +++++
arch/arm/boot/dts/at91sam9263.dtsi | 5 +++++
arch/arm/boot/dts/at91sam9g45.dtsi | 5 +++++
arch/arm/boot/dts/at91sam9n12.dtsi | 5 +++++
arch/arm/boot/dts/at91sam9x5.dtsi | 5 +++++
arch/arm/boot/dts/sama5d3.dtsi | 5 +++++
6 files changed, 30 insertions(+)
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index 899a7cf..6c44c35 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -643,6 +643,11 @@
watchdog at fffffd40 {
compatible = "atmel,at91sam9260-wdt";
reg = <0xfffffd40 0x10>;
+ interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+ atmel,watchdog-type = "hardware";
+ atmel,reset-type = "all";
+ atmel,dbg-halt;
+ atmel,idle-halt;
status = "disabled";
};
};
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index ff63811..6b31ee0 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -519,6 +519,11 @@
watchdog at fffffd40 {
compatible = "atmel,at91sam9260-wdt";
reg = <0xfffffd40 0x10>;
+ interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+ atmel,watchdog-type = "hardware";
+ atmel,reset-type = "all";
+ atmel,dbg-halt;
+ atmel,idle-halt;
status = "disabled";
};
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index faec17d..ca1a643 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -634,6 +634,11 @@
watchdog at fffffd40 {
compatible = "atmel,at91sam9260-wdt";
reg = <0xfffffd40 0x10>;
+ interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+ atmel,watchdog-type = "hardware";
+ atmel,reset-type = "all";
+ atmel,dbg-halt;
+ atmel,idle-halt;
status = "disabled";
};
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index 3166e1d..7c8a5ea 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -505,6 +505,11 @@
watchdog at fffffe40 {
compatible = "atmel,at91sam9260-wdt";
reg = <0xfffffe40 0x10>;
+ interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+ atmel,watchdog-type = "hardware";
+ atmel,reset-type = "all";
+ atmel,dbg-halt;
+ atmel,idle-halt;
status = "disabled";
};
};
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index e77106e..48eb1cc 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -742,6 +742,11 @@
watchdog at fffffe40 {
compatible = "atmel,at91sam9260-wdt";
reg = <0xfffffe40 0x10>;
+ interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+ atmel,watchdog-type = "hardware";
+ atmel,reset-type = "all";
+ atmel,dbg-halt;
+ atmel,idle-halt;
status = "disabled";
};
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index c00e158..7974723 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -885,6 +885,11 @@
watchdog at fffffe40 {
compatible = "atmel,at91sam9260-wdt";
reg = <0xfffffe40 0x10>;
+ interrupts = <4 IRQ_TYPE_LEVEL_HIGH 7>;
+ atmel,watchdog-type = "hardware";
+ atmel,reset-type = "all";
+ atmel,dbg-halt;
+ atmel,idle-halt;
status = "disabled";
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 3/4] ARM: at91/dt: add sam9 watchdog default options to SoCs
[not found] <1371799176-3408-1-git-send-email-b.brezillon@overkiz.com>
2013-06-21 7:29 ` [PATCH v2 3/4] ARM: at91/dt: add sam9 watchdog default options to SoCs Boris BREZILLON
@ 2013-06-21 7:31 ` Boris BREZILLON
2013-06-21 7:32 ` [PATCH v2 4/4] ARM: at91/dt: add watchdog properties to kizbox board Boris BREZILLON
2013-08-26 13:25 ` [PATCH v2 0/4] watchdog: at91sam9_wdt: handle already configured wdt boris brezillon
3 siblings, 0 replies; 5+ messages in thread
From: Boris BREZILLON @ 2013-06-21 7:31 UTC (permalink / raw)
To: linux-arm-kernel
Set default watchdog options in every SoC compatible with the sam9 watchdog.
Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
---
arch/arm/boot/dts/at91sam9260.dtsi | 5 +++++
arch/arm/boot/dts/at91sam9263.dtsi | 5 +++++
arch/arm/boot/dts/at91sam9g45.dtsi | 5 +++++
arch/arm/boot/dts/at91sam9n12.dtsi | 5 +++++
arch/arm/boot/dts/at91sam9x5.dtsi | 5 +++++
arch/arm/boot/dts/sama5d3.dtsi | 5 +++++
6 files changed, 30 insertions(+)
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index 899a7cf..6c44c35 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -643,6 +643,11 @@
watchdog at fffffd40 {
compatible = "atmel,at91sam9260-wdt";
reg = <0xfffffd40 0x10>;
+ interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+ atmel,watchdog-type = "hardware";
+ atmel,reset-type = "all";
+ atmel,dbg-halt;
+ atmel,idle-halt;
status = "disabled";
};
};
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index ff63811..6b31ee0 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -519,6 +519,11 @@
watchdog at fffffd40 {
compatible = "atmel,at91sam9260-wdt";
reg = <0xfffffd40 0x10>;
+ interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+ atmel,watchdog-type = "hardware";
+ atmel,reset-type = "all";
+ atmel,dbg-halt;
+ atmel,idle-halt;
status = "disabled";
};
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index faec17d..ca1a643 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -634,6 +634,11 @@
watchdog at fffffd40 {
compatible = "atmel,at91sam9260-wdt";
reg = <0xfffffd40 0x10>;
+ interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+ atmel,watchdog-type = "hardware";
+ atmel,reset-type = "all";
+ atmel,dbg-halt;
+ atmel,idle-halt;
status = "disabled";
};
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index 3166e1d..7c8a5ea 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -505,6 +505,11 @@
watchdog at fffffe40 {
compatible = "atmel,at91sam9260-wdt";
reg = <0xfffffe40 0x10>;
+ interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+ atmel,watchdog-type = "hardware";
+ atmel,reset-type = "all";
+ atmel,dbg-halt;
+ atmel,idle-halt;
status = "disabled";
};
};
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index e77106e..48eb1cc 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -742,6 +742,11 @@
watchdog at fffffe40 {
compatible = "atmel,at91sam9260-wdt";
reg = <0xfffffe40 0x10>;
+ interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+ atmel,watchdog-type = "hardware";
+ atmel,reset-type = "all";
+ atmel,dbg-halt;
+ atmel,idle-halt;
status = "disabled";
};
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index c00e158..7974723 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -885,6 +885,11 @@
watchdog at fffffe40 {
compatible = "atmel,at91sam9260-wdt";
reg = <0xfffffe40 0x10>;
+ interrupts = <4 IRQ_TYPE_LEVEL_HIGH 7>;
+ atmel,watchdog-type = "hardware";
+ atmel,reset-type = "all";
+ atmel,dbg-halt;
+ atmel,idle-halt;
status = "disabled";
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 4/4] ARM: at91/dt: add watchdog properties to kizbox board
[not found] <1371799176-3408-1-git-send-email-b.brezillon@overkiz.com>
2013-06-21 7:29 ` [PATCH v2 3/4] ARM: at91/dt: add sam9 watchdog default options to SoCs Boris BREZILLON
2013-06-21 7:31 ` Boris BREZILLON
@ 2013-06-21 7:32 ` Boris BREZILLON
2013-08-26 13:25 ` [PATCH v2 0/4] watchdog: at91sam9_wdt: handle already configured wdt boris brezillon
3 siblings, 0 replies; 5+ messages in thread
From: Boris BREZILLON @ 2013-06-21 7:32 UTC (permalink / raw)
To: linux-arm-kernel
Add watchdog specific config for kizbox board.
Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
---
arch/arm/boot/dts/kizbox.dts | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm/boot/dts/kizbox.dts b/arch/arm/boot/dts/kizbox.dts
index 02df191..928f6ee 100644
--- a/arch/arm/boot/dts/kizbox.dts
+++ b/arch/arm/boot/dts/kizbox.dts
@@ -53,6 +53,12 @@
status = "okay";
};
+ watchdog at fffffd40 {
+ timeout-sec = <15>;
+ atmel,max-heartbeat-sec = <16>;
+ atmel,min-heartbeat-sec = <0>;
+ status = "okay";
+ };
};
nand0: nand at 40000000 {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 0/4] watchdog: at91sam9_wdt: handle already configured wdt
[not found] <1371799176-3408-1-git-send-email-b.brezillon@overkiz.com>
` (2 preceding siblings ...)
2013-06-21 7:32 ` [PATCH v2 4/4] ARM: at91/dt: add watchdog properties to kizbox board Boris BREZILLON
@ 2013-08-26 13:25 ` boris brezillon
2013-08-27 0:43 ` Yang, Wenyou
3 siblings, 1 reply; 5+ messages in thread
From: boris brezillon @ 2013-08-26 13:25 UTC (permalink / raw)
To: linux-arm-kernel
Hello Yang,
Did you test/review this series ?
If you did, could you add your Acked, Reviewed and/or Tested-by.
I'd really like to get this series merged to mainline.
Thanks.
Best Regards,
Boris
On 21/06/2013 09:19, Boris BREZILLON wrote:
> Hello,
>
> This patch series is a porposal to enhance the sam9 watchdog timer support.
>
> The at91sam9 watchdog timer can only be configured once, and the current
> implementation tries to configure it in a static way:
> - 2 seconds timeout
> - wdt restart every 500ms
>
> If the timer has already been configured with different values, it returns an
> error and do not create any watchdog device.
>
> This is not critical if the watchdog is disabled, but if it has been enabled
> with different timeout values it will lead to a SoC reset.
>
> This patch series tries to address this issue by adapting the heartbeat value
> according the WDT timer config:
> - it first tries to configure the timer as requested.
> - if it fails it fallbacks to the current config, adapting its heartbeat timer
> to the needs
>
> This patch series also move to a dynamically allocated at91wdt device instead
> of the static instance. I'm not sure this is the best solution, so please tell
> me if you prefer to keep static instance of watchdog.
>
> It adds a new at91 wdt type: software. This new type make use of the at91 wdt
> interrupt to trigger a software reboot.
>
> Finally it adds several properties to the device tree bindings.
>
> Best Regards,
> Boris
>
> Change since v1:
> - fix typo in documentaion
> - fix irq dt definition for sama5d3 SoC
>
> Boris BREZILLON (4):
> watchdog: at91sam9_wdt: better watchdog support
> watchdog: at91sam9_wdt: update device tree doc
> ARM: at91/dt: add sam9 watchdog default options to SoCs
> ARM: at91/dt: add watchdog properties to kizbox board
>
> .../devicetree/bindings/watchdog/atmel-wdt.txt | 30 +-
> arch/arm/boot/dts/at91sam9260.dtsi | 5 +
> arch/arm/boot/dts/at91sam9263.dtsi | 5 +
> arch/arm/boot/dts/at91sam9g45.dtsi | 5 +
> arch/arm/boot/dts/at91sam9n12.dtsi | 5 +
> arch/arm/boot/dts/at91sam9x5.dtsi | 5 +
> arch/arm/boot/dts/kizbox.dts | 6 +
> arch/arm/boot/dts/sama5d3.dtsi | 5 +
> drivers/watchdog/at91sam9_wdt.c | 319 +++++++++++++++-----
> 9 files changed, 300 insertions(+), 85 deletions(-)
>
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v2 0/4] watchdog: at91sam9_wdt: handle already configured wdt
2013-08-26 13:25 ` [PATCH v2 0/4] watchdog: at91sam9_wdt: handle already configured wdt boris brezillon
@ 2013-08-27 0:43 ` Yang, Wenyou
0 siblings, 0 replies; 5+ messages in thread
From: Yang, Wenyou @ 2013-08-27 0:43 UTC (permalink / raw)
To: linux-arm-kernel
> -----Original Message-----
> From: boris brezillon [mailto:b.brezillon at overkiz.com]
> Sent: 2013?8?26? 21:26
> To: Boris BREZILLON; Yang, Wenyou
> Cc: Wim Van Sebroeck; Ferre, Nicolas; Jean-Christophe PLAGNIOL-VILLARD;
> Desroches, Ludovic; linux-watchdog at vger.kernel.org;
> linux-kernel at vger.kernel.org; linux-arm-kernel at lists.infradead.org
> Subject: Re: [PATCH v2 0/4] watchdog: at91sam9_wdt: handle already
> configured wdt
>
> Hello Yang,
>
> Did you test/review this series ?
>
> If you did, could you add your Acked, Reviewed and/or Tested-by.
> I'd really like to get this series merged to mainline.
>
> Thanks.
>
> Best Regards,
> Boris
>
> On 21/06/2013 09:19, Boris BREZILLON wrote:
> > Hello,
> >
> > This patch series is a porposal to enhance the sam9 watchdog timer support.
> >
> > The at91sam9 watchdog timer can only be configured once, and the current
> > implementation tries to configure it in a static way:
> > - 2 seconds timeout
> > - wdt restart every 500ms
> >
> > If the timer has already been configured with different values, it returns an
> > error and do not create any watchdog device.
> >
> > This is not critical if the watchdog is disabled, but if it has been enabled
> > with different timeout values it will lead to a SoC reset.
> >
> > This patch series tries to address this issue by adapting the heartbeat value
> > according the WDT timer config:
> > - it first tries to configure the timer as requested.
> > - if it fails it fallbacks to the current config, adapting its heartbeat timer
> > to the needs
> >
> > This patch series also move to a dynamically allocated at91wdt device instead
> > of the static instance. I'm not sure this is the best solution, so please tell
> > me if you prefer to keep static instance of watchdog.
> >
> > It adds a new at91 wdt type: software. This new type make use of the at91
> wdt
> > interrupt to trigger a software reboot.
> >
> > Finally it adds several properties to the device tree bindings.
> >
> > Best Regards,
> > Boris
> >
> > Change since v1:
> > - fix typo in documentaion
> > - fix irq dt definition for sama5d3 SoC
> >
> > Boris BREZILLON (4):
> > watchdog: at91sam9_wdt: better watchdog support
> > watchdog: at91sam9_wdt: update device tree doc
> > ARM: at91/dt: add sam9 watchdog default options to SoCs
> > ARM: at91/dt: add watchdog properties to kizbox board
> >
> > .../devicetree/bindings/watchdog/atmel-wdt.txt | 30 +-
> > arch/arm/boot/dts/at91sam9260.dtsi | 5 +
> > arch/arm/boot/dts/at91sam9263.dtsi | 5 +
> > arch/arm/boot/dts/at91sam9g45.dtsi | 5 +
> > arch/arm/boot/dts/at91sam9n12.dtsi | 5 +
> > arch/arm/boot/dts/at91sam9x5.dtsi | 5 +
> > arch/arm/boot/dts/kizbox.dts | 6 +
> > arch/arm/boot/dts/sama5d3.dtsi | 5 +
> > drivers/watchdog/at91sam9_wdt.c | 319
> +++++++++++++++-----
> > 9 files changed, 300 insertions(+), 85 deletions(-)
> >
Tested on sama5d34ek, at91sam9g25ek, linux-next_20130620
Tested-by Wenyou Yang <Wenyou.yang@atmel.com>
Best Regards,
Wenyou Yang
^ permalink raw reply [flat|nested] 5+ messages in thread