From 800bc01865edf4d25bf1fbfdc83a175c05189518 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Mon, 18 Jul 2011 11:15:21 +0800
Subject: [PATCH] --- yaml --- r: 261095 b: refs/heads/master c:
 f5a427eedeead2be82561497a12788bd1f0c07d3 h: refs/heads/master i:   261093:
 ab7734be3f0375a68fc53c2bea95bdb98e3447a0   261091:
 ec1c169145c87d926fd30df4accdae346a5125cf   261087:
 d34b6dd743262a00697e92e7df53825069566bb3 v: v3

---
 [refs]                                             |  2 +-
 .../devicetree/bindings/watchdog/fsl-imx-wdt.txt   | 14 ++++++++++++++
 trunk/drivers/watchdog/imx2_wdt.c                  |  6 ++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 trunk/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt

diff --git a/[refs] b/[refs]
index ece52c2e8111..c2ddca0543bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9487a9cc7140ef88d532c989570ee77436ede1e0
+refs/heads/master: f5a427eedeead2be82561497a12788bd1f0c07d3
diff --git a/trunk/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt b/trunk/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt
new file mode 100644
index 000000000000..2144af1a5264
--- /dev/null
+++ b/trunk/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt
@@ -0,0 +1,14 @@
+* Freescale i.MX Watchdog Timer (WDT) Controller
+
+Required properties:
+- compatible : Should be "fsl,<soc>-wdt"
+- reg : Should contain WDT registers location and length
+- interrupts : Should contain WDT interrupt
+
+Examples:
+
+wdt@73f98000 {
+	compatible = "fsl,imx51-wdt", "fsl,imx21-wdt";
+	reg = <0x73f98000 0x4000>;
+	interrupts = <58>;
+};
diff --git a/trunk/drivers/watchdog/imx2_wdt.c b/trunk/drivers/watchdog/imx2_wdt.c
index 86f7cac1026c..b8ef2c6dca7c 100644
--- a/trunk/drivers/watchdog/imx2_wdt.c
+++ b/trunk/drivers/watchdog/imx2_wdt.c
@@ -329,12 +329,18 @@ static void imx2_wdt_shutdown(struct platform_device *pdev)
 	}
 }
 
+static const struct of_device_id imx2_wdt_dt_ids[] = {
+	{ .compatible = "fsl,imx21-wdt", },
+	{ /* sentinel */ }
+};
+
 static struct platform_driver imx2_wdt_driver = {
 	.remove		= __exit_p(imx2_wdt_remove),
 	.shutdown	= imx2_wdt_shutdown,
 	.driver		= {
 		.name	= DRIVER_NAME,
 		.owner	= THIS_MODULE,
+		.of_match_table = imx2_wdt_dt_ids,
 	},
 };