diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-20 23:11:45 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-20 23:11:45 -0800 |
| commit | 6fe05f33da536ac60a4c4e6807f454937047de54 (patch) | |
| tree | e19b71fdaea03e4b3599d425b6f2c29bdcd97a20 /drivers/watchdog | |
| parent | 3fcdc0555f5043eded6312efce14cd8dd66f30f8 (diff) | |
| parent | 824b43968fed4b5a200cfef06129c0470eef306a (diff) | |
| download | linux-6fe05f33da536ac60a4c4e6807f454937047de54.tar.gz linux-6fe05f33da536ac60a4c4e6807f454937047de54.tar.bz2 linux-6fe05f33da536ac60a4c4e6807f454937047de54.zip | |
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 @@ #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), }, }; |