diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2012-06-10 15:20:06 +0200 |
|---|---|---|
| committer | Andrew Lunn <andrew@lunn.ch> | 2012-07-27 16:48:38 +0200 |
| commit | 1e7bad0f5b91150fef78d732095ca84ca4a16585 (patch) | |
| tree | e207c3b588a060914f75f811aff900d70209bce7 /drivers | |
| parent | ARM: Orion: Add arch support needed for I2C via DT. (diff) | |
| download | linux-1e7bad0f5b91150fef78d732095ca84ca4a16585.tar.xz linux-1e7bad0f5b91150fef78d732095ca84ca4a16585.zip | |
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')
| -rw-r--r-- | drivers/watchdog/orion_wdt.c | 8 |
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 @@ #include <linux/io.h> #include <linux/spinlock.h> #include <linux/clk.h> +#include <linux/of.h> #include <mach/bridge-regs.h> /* @@ -295,6 +296,12 @@ static void orion_wdt_shutdown(struct platform_device *pdev) orion_wdt_disable(); } +static const struct of_device_id orion_wdt_of_match_table[] __devinitdata = { + { .compatible = "marvell,orion-wdt", }, + {}, +}; +MODULE_DEVICE_TABLE(of, orion_wdt_of_match_table); + static struct platform_driver orion_wdt_driver = { .probe = orion_wdt_probe, .remove = __devexit_p(orion_wdt_remove), @@ -302,6 +309,7 @@ static struct platform_driver orion_wdt_driver = { .driver = { .owner = THIS_MODULE, .name = "orion_wdt", + .of_match_table = of_match_ptr(orion_wdt_of_match_table), }, }; |