aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/devicetree/bindings/watchdog/davinci-wdt.txt12
-rw-r--r--drivers/watchdog/davinci_wdt.c7
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 @@
1DaVinci Watchdog Timer (WDT) Controller
2
3Required properties:
4- compatible : Should be "ti,davinci-wdt"
5- reg : Should contain WDT registers location and length
6
7Examples:
8
9wdt: 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
265static const struct of_device_id davinci_wdt_of_match[] = {
266 { .compatible = "ti,davinci-wdt", },
267 {},
268};
269MODULE_DEVICE_TABLE(of, davinci_wdt_of_match);
270
265static struct platform_driver platform_wdt_driver = { 271static 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,