diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-21 02:11:45 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-21 02:11:45 -0500 |
commit | 6fe05f33da536ac60a4c4e6807f454937047de54 (patch) | |
tree | e19b71fdaea03e4b3599d425b6f2c29bdcd97a20 /drivers/watchdog | |
parent | 3fcdc0555f5043eded6312efce14cd8dd66f30f8 (diff) | |
parent | 824b43968fed4b5a200cfef06129c0470eef306a (diff) |
Merge tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91 into next/dt
From Nicolas Ferre:
More DT material for AT91:
- conversion of watchdog to DT
- usart definition for evk-pro3 board
* tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91:
ARM: at91/dts: evk-pro3: enable watchdog
ARM: at91/dts: add at91sam9_wdt driver to at91sam926x, at91sam9g45
watchdog: at91sam9_wdt: add device tree support
ARM: at91: dt: evk-pro3: enable uart0 and uart2
Diffstat (limited to 'drivers/watchdog')
-rw-r--r-- | drivers/watchdog/at91sam9_wdt.c | 11 |
1 files changed, 11 insertions, 0 deletions
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 | ||