aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2012-06-10 09:20:06 -0400
committerAndrew Lunn <andrew@lunn.ch>2012-07-27 10:48:38 -0400
commit1e7bad0f5b91150fef78d732095ca84ca4a16585 (patch)
treee207c3b588a060914f75f811aff900d70209bce7 /drivers/watchdog
parente91cac0a7746b2ce9d4134098678e3cc8cbf032d (diff)
ARM: Orion: DTify the watchdog timer.
Add device tree support to the Orion watchdog timer, and enable its use in the kirkwood devices using device tree. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@googlemail.com> Tested-by: Simon Baatz <gmbnomis@gmail.com>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/orion_wdt.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 0f5736949c61..1531e0256c34 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -25,6 +25,7 @@
25#include <linux/io.h> 25#include <linux/io.h>
26#include <linux/spinlock.h> 26#include <linux/spinlock.h>
27#include <linux/clk.h> 27#include <linux/clk.h>
28#include <linux/of.h>
28#include <mach/bridge-regs.h> 29#include <mach/bridge-regs.h>
29 30
30/* 31/*
@@ -295,6 +296,12 @@ static void orion_wdt_shutdown(struct platform_device *pdev)
295 orion_wdt_disable(); 296 orion_wdt_disable();
296} 297}
297 298
299static const struct of_device_id orion_wdt_of_match_table[] __devinitdata = {
300 { .compatible = "marvell,orion-wdt", },
301 {},
302};
303MODULE_DEVICE_TABLE(of, orion_wdt_of_match_table);
304
298static struct platform_driver orion_wdt_driver = { 305static struct platform_driver orion_wdt_driver = {
299 .probe = orion_wdt_probe, 306 .probe = orion_wdt_probe,
300 .remove = __devexit_p(orion_wdt_remove), 307 .remove = __devexit_p(orion_wdt_remove),
@@ -302,6 +309,7 @@ static struct platform_driver orion_wdt_driver = {
302 .driver = { 309 .driver = {
303 .owner = THIS_MODULE, 310 .owner = THIS_MODULE,
304 .name = "orion_wdt", 311 .name = "orion_wdt",
312 .of_match_table = of_match_ptr(orion_wdt_of_match_table),
305 }, 313 },
306}; 314};
307 315