---

yaml --- r: 347999 b: refs/heads/master c: 902e2e7 h: refs/heads/master i: 347997: bf3b051 347995: 978bd00 347991: 2040eca 347983: 689cbb8 347967: d9d148d v: v3
git-mirror · Dec 19, 2012 · dec43ae · dec43ae
1 parent 9637c33
commit dec43ae
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0360dffedd7bad92f174b2ce5e69e960451d2b59
+refs/heads/master: 902e2e7d482c55395652ff78cb3457fc390b101d
diff --git a/trunk/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt b/trunk/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
@@ -0,0 +1,12 @@
+DaVinci Watchdog Timer (WDT) Controller
+
+Required properties:
+- compatible : Should be "ti,davinci-wdt"
+- reg : Should contain WDT registers location and length
+
+Examples:
+
+wdt: wdt@2320000 {
+	compatible = "ti,davinci-wdt";
+	reg = <0x02320000 0x80>;
+};
diff --git a/trunk/drivers/watchdog/davinci_wdt.c b/trunk/drivers/watchdog/davinci_wdt.c
@@ -262,10 +262,17 @@ static int davinci_wdt_remove(struct platform_device *pdev)
 	return 0;
 }
 
+static const struct of_device_id davinci_wdt_of_match[] = {
+	{ .compatible = "ti,davinci-wdt", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, davinci_wdt_of_match);
+
 static struct platform_driver platform_wdt_driver = {
 	.driver = {
 		.name = "watchdog",
 		.owner	= THIS_MODULE,
+		.of_match_table = davinci_wdt_of_match,
 	},
 	.probe = davinci_wdt_probe,
 	.remove = davinci_wdt_remove,