diff options
author | Murali Karicheri <m-karicheri2@ti.com> | 2012-11-26 16:41:35 -0500 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2012-12-19 16:25:08 -0500 |
commit | 902e2e7d482c55395652ff78cb3457fc390b101d (patch) | |
tree | 75b1540807e49526821eb058ad642338754b0c47 | |
parent | 0360dffedd7bad92f174b2ce5e69e960451d2b59 (diff) |
watchdog: davinci_wdt: add OF support
This adds OF support for davinci_wdt driver.
Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
-rw-r--r-- | Documentation/devicetree/bindings/watchdog/davinci-wdt.txt | 12 | ||||
-rw-r--r-- | drivers/watchdog/davinci_wdt.c | 7 |
2 files changed, 19 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt new file mode 100644 index 000000000000..75558ccd9a05 --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt | |||
@@ -0,0 +1,12 @@ | |||
1 | DaVinci Watchdog Timer (WDT) Controller | ||
2 | |||
3 | Required properties: | ||
4 | - compatible : Should be "ti,davinci-wdt" | ||
5 | - reg : Should contain WDT registers location and length | ||
6 | |||
7 | Examples: | ||
8 | |||
9 | wdt: wdt@2320000 { | ||
10 | compatible = "ti,davinci-wdt"; | ||
11 | reg = <0x02320000 0x80>; | ||
12 | }; | ||
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c index 6000aea7e2e1..e8e87246ea6d 100644 --- a/drivers/watchdog/davinci_wdt.c +++ b/drivers/watchdog/davinci_wdt.c | |||
@@ -262,10 +262,17 @@ static int davinci_wdt_remove(struct platform_device *pdev) | |||
262 | return 0; | 262 | return 0; |
263 | } | 263 | } |
264 | 264 | ||
265 | static const struct of_device_id davinci_wdt_of_match[] = { | ||
266 | { .compatible = "ti,davinci-wdt", }, | ||
267 | {}, | ||
268 | }; | ||
269 | MODULE_DEVICE_TABLE(of, davinci_wdt_of_match); | ||
270 | |||
265 | static struct platform_driver platform_wdt_driver = { | 271 | static struct platform_driver platform_wdt_driver = { |
266 | .driver = { | 272 | .driver = { |
267 | .name = "watchdog", | 273 | .name = "watchdog", |
268 | .owner = THIS_MODULE, | 274 | .owner = THIS_MODULE, |
275 | .of_match_table = davinci_wdt_of_match, | ||
269 | }, | 276 | }, |
270 | .probe = davinci_wdt_probe, | 277 | .probe = davinci_wdt_probe, |
271 | .remove = davinci_wdt_remove, | 278 | .remove = davinci_wdt_remove, |