From: Andrew Lunn <andrew@lunn.ch>
To: Fabio Porcedda <fabio.porcedda@gmail.com>
Cc: Andrew Lunn <andrew@lunn.ch>,
linux-watchdog@vger.kernel.org,
devicetree-discuss@lists.ozlabs.org,
Nicolas Ferre <nicolas.ferre@atmel.com>,
Wim Van Sebroeck <wim@iguana.be>,
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>,
Andrew Victor <linux@maxim.org.za>,
linux-arm-kernel@lists.infradead.org,
Jason Cooper <jason@lakedaemon.net>
Subject: Re: [PATCH v6 3/5] watchdog: at91sam9_wdt: add device tree support
Date: Mon, 1 Oct 2012 14:45:46 +0200 [thread overview]
Message-ID: <20121001124546.GE11837@lunn.ch> (raw)
In-Reply-To: <1349094281-28889-4-git-send-email-fabio.porcedda@gmail.com>
On Mon, Oct 01, 2012 at 02:24:39PM +0200, Fabio Porcedda wrote:
> Tested on an at91sam9260 board (evk-pro3)
>
> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
> ---
> .../devicetree/bindings/watchdog/atmel-wdt.txt | 19 +++++++++++++++++++
> drivers/watchdog/at91sam9_wdt.c | 21 +++++++++++++++++++++
> 2 files changed, 40 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/watchdog/atmel-wdt.txt
>
> diff --git a/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt
> new file mode 100644
> index 0000000..65c1755
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt
> @@ -0,0 +1,19 @@
> +* Atmel Watchdog Timers
> +
> +** at91sam9-wdt
> +
> +Required properties:
> +- compatible: must be "atmel,at91sam9260-wdt".
> +- reg: physical base address of the controller and length of memory mapped
> + region.
> +
> +Optional properties:
> +- timeout: contains the watchdog timeout in seconds.
> +
> +Example:
> +
> + watchdog@fffffd40 {
> + compatible = "atmel,at91sam9260-wdt";
> + reg = <0xfffffd40 0x10>;
> + timeout = <10>;
> + };
> diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
> index 05e1be8..c9e6bfa 100644
> --- a/drivers/watchdog/at91sam9_wdt.c
> +++ b/drivers/watchdog/at91sam9_wdt.c
> @@ -32,6 +32,7 @@
> #include <linux/timer.h>
> #include <linux/bitops.h>
> #include <linux/uaccess.h>
> +#include <linux/of.h>
>
> #include "at91sam9_wdt.h"
>
> @@ -254,6 +255,14 @@ static struct miscdevice at91wdt_miscdev = {
> .fops = &at91wdt_fops,
> };
>
> +static inline void __init at91wdt_probe_dt(struct device_node *node)
> +{
> + if (!node)
> + return;
> +
> + of_property_read_u32(node, "timeout", &heartbeat);
> +}
> +
In patch #1 you add a function to do this, and then you don't make use
of it here ?
Or am i missing something?
Thanks
Andrew
next prev parent reply other threads:[~2012-10-01 12:45 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-01 12:24 [PATCH v6 0/5] watchdog: orion_wdt & at91sam9_wdt: improve dt support Fabio Porcedda
[not found] ` <1349094281-28889-1-git-send-email-fabio.porcedda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2012-10-01 12:24 ` [PATCH v6 1/5] watchdog: core: dt: add support for the timeout device tree property Fabio Porcedda
2012-10-01 12:24 ` [PATCH v6 2/5] watchdog: orion_wdt: dt: add the timeout property binding Fabio Porcedda
2012-10-01 12:24 ` [PATCH v6 3/5] watchdog: at91sam9_wdt: add device tree support Fabio Porcedda
2012-10-01 12:45 ` Andrew Lunn [this message]
[not found] ` <20121001124546.GE11837-g2DYL2Zd6BY@public.gmane.org>
2012-10-01 12:48 ` Fabio Porcedda
[not found] ` <CAHkwnC_u+bMX7REU5G3u=cm3VGmOUn+AShruw+ERkPJWtZpxUg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-10-01 12:54 ` Fabio Porcedda
[not found] ` <CAHkwnC_5wRgf-DGnUfzkrreT_E1v8i=G8U0qo_5t1DY6+L7c+w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-10-01 13:06 ` Andrew Lunn
[not found] ` <20121001130658.GG11837-g2DYL2Zd6BY@public.gmane.org>
2012-10-02 15:04 ` Fabio Porcedda
2012-10-02 19:00 ` Jean-Christophe PLAGNIOL-VILLARD
[not found] ` <20121002190020.GD5117-RQcB7r2h9QmfDR2tN2SG5Ni2O/JbrIOy@public.gmane.org>
2012-10-03 16:32 ` Fabio Porcedda
2012-10-03 17:47 ` Jean-Christophe PLAGNIOL-VILLARD
[not found] ` <CAHkwnC83DcKXZOtLse_xnYe7zOZ5qwGJVimLkBzDwSJ7Y5vL_Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-10-02 19:59 ` Andrew Lunn
[not found] ` <20121002195914.GG21046-g2DYL2Zd6BY@public.gmane.org>
2012-10-03 16:32 ` Fabio Porcedda
2012-10-01 12:56 ` Andrew Lunn
2012-10-01 12:24 ` [PATCH v6 4/5] ARM: at91/dts: add at91sam9_wdt driver to at91sam926x, at91sam9g45 Fabio Porcedda
2012-10-01 12:24 ` [PATCH v6 5/5] ARM: at91/dts: evk-pro3: enable watchdog Fabio Porcedda
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=20121001124546.GE11837@lunn.ch \
--to=andrew@lunn.ch \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=fabio.porcedda@gmail.com \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@maxim.org.za \
--cc=nicolas.ferre@atmel.com \
--cc=plagnioj@jcrosoft.com \
--cc=wim@iguana.be \
/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).