diff options
author | Fabio Porcedda <fabio.porcedda@gmail.com> | 2012-11-12 03:37:25 -0500 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-11-16 09:48:30 -0500 |
commit | be49bbae13ba9128ac69dd4b98027f6412155abe (patch) | |
tree | ec8bea2c2e6d80f410da1e9c679af8e2b8a7b9e6 | |
parent | 8cf70f3dc04a9303e73eecd523550c647e5ddbd0 (diff) |
watchdog: at91sam9_wdt: add device tree support
Tested on an at91sam9260 board (evk-pro3)
Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
-rw-r--r-- | Documentation/devicetree/bindings/watchdog/atmel-wdt.txt | 15 | ||||
-rw-r--r-- | drivers/watchdog/at91sam9_wdt.c | 11 |
2 files changed, 26 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt new file mode 100644 index 000000000000..2957ebb5aa71 --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt | |||
@@ -0,0 +1,15 @@ | |||
1 | * Atmel Watchdog Timers | ||
2 | |||
3 | ** at91sam9-wdt | ||
4 | |||
5 | Required properties: | ||
6 | - compatible: must be "atmel,at91sam9260-wdt". | ||
7 | - reg: physical base address of the controller and length of memory mapped | ||
8 | region. | ||
9 | |||
10 | Example: | ||
11 | |||
12 | watchdog@fffffd40 { | ||
13 | compatible = "atmel,at91sam9260-wdt"; | ||
14 | reg = <0xfffffd40 0x10>; | ||
15 | }; | ||
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c index 05e1be85fdee..dc42e44b6bc1 100644 --- a/drivers/watchdog/at91sam9_wdt.c +++ b/drivers/watchdog/at91sam9_wdt.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <linux/timer.h> | 32 | #include <linux/timer.h> |
33 | #include <linux/bitops.h> | 33 | #include <linux/bitops.h> |
34 | #include <linux/uaccess.h> | 34 | #include <linux/uaccess.h> |
35 | #include <linux/of.h> | ||
35 | 36 | ||
36 | #include "at91sam9_wdt.h" | 37 | #include "at91sam9_wdt.h" |
37 | 38 | ||
@@ -302,11 +303,21 @@ static int __exit at91wdt_remove(struct platform_device *pdev) | |||
302 | return res; | 303 | return res; |
303 | } | 304 | } |
304 | 305 | ||
306 | #if defined(CONFIG_OF) | ||
307 | static const struct of_device_id at91_wdt_dt_ids[] __initconst = { | ||
308 | { .compatible = "atmel,at91sam9260-wdt" }, | ||
309 | { /* sentinel */ } | ||
310 | }; | ||
311 | |||
312 | MODULE_DEVICE_TABLE(of, at91_wdt_dt_ids); | ||
313 | #endif | ||
314 | |||
305 | static struct platform_driver at91wdt_driver = { | 315 | static struct platform_driver at91wdt_driver = { |
306 | .remove = __exit_p(at91wdt_remove), | 316 | .remove = __exit_p(at91wdt_remove), |
307 | .driver = { | 317 | .driver = { |
308 | .name = "at91_wdt", | 318 | .name = "at91_wdt", |
309 | .owner = THIS_MODULE, | 319 | .owner = THIS_MODULE, |
320 | .of_match_table = of_match_ptr(at91_wdt_dt_ids), | ||
310 | }, | 321 | }, |
311 | }; | 322 | }; |
312 | 323 | ||