From: boris.brezillon@free-electrons.com (Boris Brezillon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: at91/dt: keep watchdog running in idle mode
Date: Wed, 4 Mar 2015 11:04:37 +0100 [thread overview]
Message-ID: <20150304110437.71c46526@bbrezillon> (raw)
In-Reply-To: <549954F7.9070009@objectxp.com>
On Tue, 23 Dec 2014 12:41:43 +0100
Michel Marti <mma@objectxp.com> wrote:
> Since turning on idle-halt in commit fe46aa679, SoCs compatible with
> the sam9 watchdog no longer reboot if the wdt times out. Removing the
> 'idle-halt' flag fixes this.
>
> Signed-off-by: Michel Marti <mma@objectxp.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> ---
> arch/arm/boot/dts/at91sam9260.dtsi | 1 -
> arch/arm/boot/dts/at91sam9263.dtsi | 1 -
> arch/arm/boot/dts/at91sam9g45.dtsi | 1 -
> arch/arm/boot/dts/at91sam9n12.dtsi | 1 -
> arch/arm/boot/dts/at91sam9x5.dtsi | 1 -
> arch/arm/boot/dts/sama5d3.dtsi | 1 -
> 6 files changed, 6 deletions(-)
>
> diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
> index dd1313c..184e1d1 100644
> --- a/arch/arm/boot/dts/at91sam9260.dtsi
> +++ b/arch/arm/boot/dts/at91sam9260.dtsi
> @@ -971,7 +971,6 @@
> 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 1467750..c39556b 100644
> --- a/arch/arm/boot/dts/at91sam9263.dtsi
> +++ b/arch/arm/boot/dts/at91sam9263.dtsi
> @@ -874,7 +874,6 @@
> 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 2a8da8a..b8d741d 100644
> --- a/arch/arm/boot/dts/at91sam9g45.dtsi
> +++ b/arch/arm/boot/dts/at91sam9g45.dtsi
> @@ -1111,7 +1111,6 @@
> 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 68eb9ad..e0b5c24 100644
> --- a/arch/arm/boot/dts/at91sam9n12.dtsi
> +++ b/arch/arm/boot/dts/at91sam9n12.dtsi
> @@ -889,7 +889,6 @@
> 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 bbb3ba6..ce61f91 100644
> --- a/arch/arm/boot/dts/at91sam9x5.dtsi
> +++ b/arch/arm/boot/dts/at91sam9x5.dtsi
> @@ -1125,7 +1125,6 @@
> 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 5f4144d..63d12ed 100644
> --- a/arch/arm/boot/dts/sama5d3.dtsi
> +++ b/arch/arm/boot/dts/sama5d3.dtsi
> @@ -1224,7 +1224,6 @@
> atmel,watchdog-type = "hardware";
> atmel,reset-type = "all";
> atmel,dbg-halt;
> - atmel,idle-halt;
> status = "disabled";
> };
>
--
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
next prev parent reply other threads:[~2015-03-04 10:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-23 11:41 [PATCH] ARM: at91/dt: keep watchdog running in idle mode Michel Marti
2015-03-04 10:04 ` Boris Brezillon [this message]
2015-03-04 10:18 ` Sylvain Rochet
2015-03-04 10:22 ` Nicolas Ferre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150304110437.71c46526@bbrezillon \
--to=boris.brezillon@free-electrons.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).