* [PATCH v9 RESEND 0/3] watchdog: at91sam9_wdt: add device tree support
@ 2012-11-12 8:37 Fabio Porcedda
2012-11-12 8:37 ` [PATCH v9 RESEND 1/3] " Fabio Porcedda
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Fabio Porcedda @ 2012-11-12 8:37 UTC (permalink / raw)
To: linux-arm-kernel
Hi all,
This patchset is for adding device tree support to the
at91sam9_wdt driver.
The "timeout-sec" binding is added by another patchset already sent:
[PATCH v4 0/8] watchdog: dt: add support for the timeout-sec dt property
Changes:
v9:
- rebased over v3.7-rc1
v8:
- add __initconst to at91_wdt_dt_ids
v7:
- split the patchset
- remove timeout binding
v6:
- add watchdog core proprty timeout binding
- add as example to the orion_wdt driver the new timeout binding
v5:
- split dts commit in two, one for socs and one for boards.
v4:
- use "atmel,at91sam9260-wdt" as compatible
v3:
- add heartbeat option
- default disabled for all the soc, enable only for evk-pro3 board
- add at91sam9263 and at91sam9g45 soc
v2:
- add missing to and cc addresses
Based on v3.7-rc5
Fabio Porcedda (3):
watchdog: at91sam9_wdt: add device tree support
ARM: at91/dts: add at91sam9_wdt driver to at91sam926x, at91sam9g45
ARM: at91/dts: evk-pro3: enable watchdog
Documentation/devicetree/bindings/watchdog/atmel-wdt.txt | 15 +++++++++++++++
arch/arm/boot/dts/at91sam9260.dtsi | 6 ++++++
arch/arm/boot/dts/at91sam9263.dtsi | 6 ++++++
arch/arm/boot/dts/at91sam9g45.dtsi | 6 ++++++
arch/arm/boot/dts/evk-pro3.dts | 4 ++++
drivers/watchdog/at91sam9_wdt.c | 11 +++++++++++
6 files changed, 48 insertions(+)
create mode 100644 Documentation/devicetree/bindings/watchdog/atmel-wdt.txt
--
1.8.0
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v9 RESEND 1/3] watchdog: at91sam9_wdt: add device tree support 2012-11-12 8:37 [PATCH v9 RESEND 0/3] watchdog: at91sam9_wdt: add device tree support Fabio Porcedda @ 2012-11-12 8:37 ` Fabio Porcedda 2012-11-16 14:56 ` Nicolas Ferre 2012-11-12 8:37 ` [PATCH v9 RESEND 2/3] ARM: at91/dts: add at91sam9_wdt driver to at91sam926x, at91sam9g45 Fabio Porcedda 2012-11-12 8:37 ` [PATCH v9 RESEND 3/3] ARM: at91/dts: evk-pro3: enable watchdog Fabio Porcedda 2 siblings, 1 reply; 5+ messages in thread From: Fabio Porcedda @ 2012-11-12 8:37 UTC (permalink / raw) To: linux-arm-kernel Tested on an at91sam9260 board (evk-pro3) Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com> --- Documentation/devicetree/bindings/watchdog/atmel-wdt.txt | 15 +++++++++++++++ drivers/watchdog/at91sam9_wdt.c | 11 +++++++++++ 2 files changed, 26 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..2957ebb --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt @@ -0,0 +1,15 @@ +* 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. + +Example: + + watchdog at fffffd40 { + compatible = "atmel,at91sam9260-wdt"; + reg = <0xfffffd40 0x10>; + }; diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c index 05e1be8..dc42e44 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" @@ -302,11 +303,21 @@ static int __exit at91wdt_remove(struct platform_device *pdev) return res; } +#if defined(CONFIG_OF) +static const struct of_device_id at91_wdt_dt_ids[] __initconst = { + { .compatible = "atmel,at91sam9260-wdt" }, + { /* sentinel */ } +}; + +MODULE_DEVICE_TABLE(of, at91_wdt_dt_ids); +#endif + static struct platform_driver at91wdt_driver = { .remove = __exit_p(at91wdt_remove), .driver = { .name = "at91_wdt", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(at91_wdt_dt_ids), }, }; -- 1.8.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v9 RESEND 1/3] watchdog: at91sam9_wdt: add device tree support 2012-11-12 8:37 ` [PATCH v9 RESEND 1/3] " Fabio Porcedda @ 2012-11-16 14:56 ` Nicolas Ferre 0 siblings, 0 replies; 5+ messages in thread From: Nicolas Ferre @ 2012-11-16 14:56 UTC (permalink / raw) To: linux-arm-kernel On 11/12/2012 09:37 AM, Fabio Porcedda : > Tested on an at91sam9260 board (evk-pro3) > > Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> (and to the whole patch series actually) Wim, can you tell me if it is possible to merge this part through arm-soc git tree with the rest of material for AT91? If yes, I would need your Acked-by... Thanks, best regards, > --- > Documentation/devicetree/bindings/watchdog/atmel-wdt.txt | 15 +++++++++++++++ > drivers/watchdog/at91sam9_wdt.c | 11 +++++++++++ > 2 files changed, 26 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..2957ebb > --- /dev/null > +++ b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt > @@ -0,0 +1,15 @@ > +* 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. > + > +Example: > + > + watchdog at fffffd40 { > + compatible = "atmel,at91sam9260-wdt"; > + reg = <0xfffffd40 0x10>; > + }; > diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c > index 05e1be8..dc42e44 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" > > @@ -302,11 +303,21 @@ static int __exit at91wdt_remove(struct platform_device *pdev) > return res; > } > > +#if defined(CONFIG_OF) > +static const struct of_device_id at91_wdt_dt_ids[] __initconst = { > + { .compatible = "atmel,at91sam9260-wdt" }, > + { /* sentinel */ } > +}; > + > +MODULE_DEVICE_TABLE(of, at91_wdt_dt_ids); > +#endif > + > static struct platform_driver at91wdt_driver = { > .remove = __exit_p(at91wdt_remove), > .driver = { > .name = "at91_wdt", > .owner = THIS_MODULE, > + .of_match_table = of_match_ptr(at91_wdt_dt_ids), > }, > }; > > -- Nicolas Ferre ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v9 RESEND 2/3] ARM: at91/dts: add at91sam9_wdt driver to at91sam926x, at91sam9g45 2012-11-12 8:37 [PATCH v9 RESEND 0/3] watchdog: at91sam9_wdt: add device tree support Fabio Porcedda 2012-11-12 8:37 ` [PATCH v9 RESEND 1/3] " Fabio Porcedda @ 2012-11-12 8:37 ` Fabio Porcedda 2012-11-12 8:37 ` [PATCH v9 RESEND 3/3] ARM: at91/dts: evk-pro3: enable watchdog Fabio Porcedda 2 siblings, 0 replies; 5+ messages in thread From: Fabio Porcedda @ 2012-11-12 8:37 UTC (permalink / raw) To: linux-arm-kernel Tested on an at91sam9260 board (evk-pro3). Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com> --- arch/arm/boot/dts/at91sam9260.dtsi | 6 ++++++ arch/arm/boot/dts/at91sam9263.dtsi | 6 ++++++ arch/arm/boot/dts/at91sam9g45.dtsi | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi index d410581..bfb5bb6 100644 --- a/arch/arm/boot/dts/at91sam9260.dtsi +++ b/arch/arm/boot/dts/at91sam9260.dtsi @@ -246,6 +246,12 @@ trigger-external; }; }; + + watchdog at fffffd40 { + compatible = "atmel,at91sam9260-wdt"; + reg = <0xfffffd40 0x10>; + status = "disabled"; + }; }; nand0: nand at 40000000 { diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi index 3e6e5c1..ff54612 100644 --- a/arch/arm/boot/dts/at91sam9263.dtsi +++ b/arch/arm/boot/dts/at91sam9263.dtsi @@ -195,6 +195,12 @@ #size-cells = <0>; status = "disabled"; }; + + watchdog at fffffd40 { + compatible = "atmel,at91sam9260-wdt"; + reg = <0xfffffd40 0x10>; + status = "disabled"; + }; }; nand0: nand at 40000000 { diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi index 3add030..a98c00a 100644 --- a/arch/arm/boot/dts/at91sam9g45.dtsi +++ b/arch/arm/boot/dts/at91sam9g45.dtsi @@ -262,6 +262,12 @@ trigger-value = <0x6>; }; }; + + watchdog at fffffd40 { + compatible = "atmel,at91sam9260-wdt"; + reg = <0xfffffd40 0x10>; + status = "disabled"; + }; }; nand0: nand at 40000000 { -- 1.8.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v9 RESEND 3/3] ARM: at91/dts: evk-pro3: enable watchdog 2012-11-12 8:37 [PATCH v9 RESEND 0/3] watchdog: at91sam9_wdt: add device tree support Fabio Porcedda 2012-11-12 8:37 ` [PATCH v9 RESEND 1/3] " Fabio Porcedda 2012-11-12 8:37 ` [PATCH v9 RESEND 2/3] ARM: at91/dts: add at91sam9_wdt driver to at91sam926x, at91sam9g45 Fabio Porcedda @ 2012-11-12 8:37 ` Fabio Porcedda 2 siblings, 0 replies; 5+ messages in thread From: Fabio Porcedda @ 2012-11-12 8:37 UTC (permalink / raw) To: linux-arm-kernel Tested on evk-pro3. Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com> --- arch/arm/boot/dts/evk-pro3.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/evk-pro3.dts b/arch/arm/boot/dts/evk-pro3.dts index b7354e6..ce959ee 100644 --- a/arch/arm/boot/dts/evk-pro3.dts +++ b/arch/arm/boot/dts/evk-pro3.dts @@ -26,6 +26,10 @@ atmel,vbus-gpio = <&pioC 5 0>; status = "okay"; }; + + watchdog at fffffd40 { + status = "okay"; + }; }; usb0: ohci at 00500000 { -- 1.8.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-11-16 14:56 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-11-12 8:37 [PATCH v9 RESEND 0/3] watchdog: at91sam9_wdt: add device tree support Fabio Porcedda 2012-11-12 8:37 ` [PATCH v9 RESEND 1/3] " Fabio Porcedda 2012-11-16 14:56 ` Nicolas Ferre 2012-11-12 8:37 ` [PATCH v9 RESEND 2/3] ARM: at91/dts: add at91sam9_wdt driver to at91sam926x, at91sam9g45 Fabio Porcedda 2012-11-12 8:37 ` [PATCH v9 RESEND 3/3] ARM: at91/dts: evk-pro3: enable watchdog Fabio Porcedda
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).