* [PATCH 0/2] watchdog: at91sam9_wdt: add device tree support @ 2012-09-19 10:22 Fabio Porcedda 2012-09-19 10:22 ` [PATCH 1/2] " Fabio Porcedda 2012-09-19 10:22 ` [PATCH 2/2] ARM: at91: add at91sam9_wdt driver to at91sam9260 Fabio Porcedda 0 siblings, 2 replies; 3+ messages in thread From: Fabio Porcedda @ 2012-09-19 10:22 UTC (permalink / raw) To: Wim Van Sebroeck, linux-watchdog Hi all, This set of patches is for adding device tree support to the at91sam_wdt driver and the at91sam9260 soc. I've tested it on an at91sam9260 board (evk-pro3). Fabio Porcedda (2): watchdog: at91sam9_wdt: add device tree support ARM: at91: add at91sam9_wdt driver to at91sam9260 Documentation/devicetree/bindings/watchdog/atmel-wdt.txt | 15 +++++++++++++++ arch/arm/boot/dts/at91sam9260.dtsi | 6 ++++++ drivers/watchdog/at91sam9_wdt.c | 11 +++++++++++ 3 files changed, 32 insertions(+) create mode 100644 Documentation/devicetree/bindings/watchdog/atmel-wdt.txt -- 1.7.11.3 ^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/2] watchdog: at91sam9_wdt: add device tree support 2012-09-19 10:22 [PATCH 0/2] watchdog: at91sam9_wdt: add device tree support Fabio Porcedda @ 2012-09-19 10:22 ` Fabio Porcedda 2012-09-19 10:22 ` [PATCH 2/2] ARM: at91: add at91sam9_wdt driver to at91sam9260 Fabio Porcedda 1 sibling, 0 replies; 3+ messages in thread From: Fabio Porcedda @ 2012-09-19 10:22 UTC (permalink / raw) To: Wim Van Sebroeck, linux-watchdog 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..fca76fd --- /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,at91sam9-wdt" +- reg: physical base address of the controller and length of memory mapped + region. + +Example: + + watchdog@fffffd40 { + compatible = "atmel,at91sam9-wdt"; + reg = <0xfffffd40 0x10>; + }; diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c index 05e1be8..c1ba2ed 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[] = { + { .compatible = "atmel,at91sam9-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.7.11.3 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] ARM: at91: add at91sam9_wdt driver to at91sam9260 2012-09-19 10:22 [PATCH 0/2] watchdog: at91sam9_wdt: add device tree support Fabio Porcedda 2012-09-19 10:22 ` [PATCH 1/2] " Fabio Porcedda @ 2012-09-19 10:22 ` Fabio Porcedda 1 sibling, 0 replies; 3+ messages in thread From: Fabio Porcedda @ 2012-09-19 10:22 UTC (permalink / raw) To: Wim Van Sebroeck, linux-watchdog Tested on an at91sam9260 board (evk-pro3) Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com> --- arch/arm/boot/dts/at91sam9260.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi index 66389c1..680b1c8 100644 --- a/arch/arm/boot/dts/at91sam9260.dtsi +++ b/arch/arm/boot/dts/at91sam9260.dtsi @@ -233,6 +233,12 @@ trigger-external; }; }; + + watchdog@fffffd40 { + compatible = "atmel,at91sam9-wdt"; + reg = <0xfffffd40 0x10>; + }; + }; nand0: nand@40000000 { -- 1.7.11.3 ^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-19 10:22 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-09-19 10:22 [PATCH 0/2] watchdog: at91sam9_wdt: add device tree support Fabio Porcedda 2012-09-19 10:22 ` [PATCH 1/2] " Fabio Porcedda 2012-09-19 10:22 ` [PATCH 2/2] ARM: at91: add at91sam9_wdt driver to at91sam9260 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).