From dec43ae8d2a4449f0e546715d74dd46366102939 Mon Sep 17 00:00:00 2001
From: Murali Karicheri <m-karicheri2@ti.com>
Date: Mon, 26 Nov 2012 16:41:35 -0500
Subject: [PATCH] --- yaml --- r: 347999 b: refs/heads/master c:
 902e2e7d482c55395652ff78cb3457fc390b101d h: refs/heads/master i:   347997:
 bf3b0515cbfb28af46513816ea8ee7d43148fe0e   347995:
 978bd00b1f1d8e34703c1224499e6c507fd1fd29   347991:
 2040ecafebbd40f4faa325562a22799db82f6ffc   347983:
 689cbb80544b5e36aef6d69ecd486e7283efbaa5   347967:
 d9d148d25091efe5baee797955b9405126726c2c v: v3

---
 [refs]                                               |  2 +-
 .../devicetree/bindings/watchdog/davinci-wdt.txt     | 12 ++++++++++++
 trunk/drivers/watchdog/davinci_wdt.c                 |  7 +++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 trunk/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt

diff --git a/[refs] b/[refs]
index 37453a0e4c4d..12744d4216d4 100644
--- 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
new file mode 100644
index 000000000000..75558ccd9a05
--- /dev/null
+++ 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
index 6000aea7e2e1..e8e87246ea6d 100644
--- 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,