diff options
| author | Thomas Abraham <thomas.abraham@linaro.org> | 2011-06-22 15:24:32 +0530 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2011-07-22 09:00:43 +0000 |
| commit | 9487a9cc7140ef88d532c989570ee77436ede1e0 (patch) | |
| tree | d0a99b859b89c461ed2cc3c45037ebb76d9b0b5e | |
| parent | 641e4f449512ced3a3b784b33ce191e664a6d2dd (diff) | |
| download | blackbird-op-linux-9487a9cc7140ef88d532c989570ee77436ede1e0.tar.gz blackbird-op-linux-9487a9cc7140ef88d532c989570ee77436ede1e0.zip | |
watchdog: s3c2410: Add support for device tree based probe
This patch adds the of_match_table to enable s3c2410-wdt driver
to be probed when watchdog device node is found in the device tree.
Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| -rw-r--r-- | Documentation/devicetree/bindings/watchdog/samsung-wdt.txt | 11 | ||||
| -rw-r--r-- | drivers/watchdog/s3c2410_wdt.c | 10 |
2 files changed, 21 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/watchdog/samsung-wdt.txt b/Documentation/devicetree/bindings/watchdog/samsung-wdt.txt new file mode 100644 index 000000000000..79ead8263ae4 --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/samsung-wdt.txt @@ -0,0 +1,11 @@ +* Samsung's Watchdog Timer Controller + +The Samsung's Watchdog controller is used for resuming system operation +after a preset amount of time during which the WDT reset event has not +occured. + +Required properties: +- compatible : should be "samsung,s3c2410-wdt" +- reg : base physical address of the controller and length of memory mapped + region. +- interrupts : interrupt number to the cpu. diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index f7f5aa00df60..30da88f47cd3 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c @@ -589,6 +589,15 @@ static int s3c2410wdt_resume(struct platform_device *dev) #define s3c2410wdt_resume NULL #endif /* CONFIG_PM */ +#ifdef CONFIG_OF +static const struct of_device_id s3c2410_wdt_match[] = { + { .compatible = "samsung,s3c2410-wdt" }, + {}, +}; +MODULE_DEVICE_TABLE(of, s3c2410_wdt_match); +#else +#define s3c2410_wdt_match NULL +#endif static struct platform_driver s3c2410wdt_driver = { .probe = s3c2410wdt_probe, @@ -599,6 +608,7 @@ static struct platform_driver s3c2410wdt_driver = { .driver = { .owner = THIS_MODULE, .name = "s3c2410-wdt", + .of_match_table = s3c2410_wdt_match, }, }; |
