From 3c54502af02967918205b508d5cad02e26b2f9f6 Mon Sep 17 00:00:00 2001
From: Xiao Jiang <jgq516@gmail.com>
Date: Fri, 1 Jun 2012 12:44:14 +0800
Subject: [PATCH] --- yaml --- r: 313271 b: refs/heads/master c:
 94c30732944a03c5d4249abefbea09147579fb92 h: refs/heads/master i:   313269:
 c2d139f2ee9cce435e4cb217df4c84562a62e78c   313267:
 a56953db4290034dc580eed3cf13f66a6647504d   313263:
 7a4d41e2d72402cc321dc755b0c09231a41549a6 v: v3

---
 [refs]                                             |  2 +-
 .../devicetree/bindings/watchdog/omap-wdt.txt      | 14 ++++++++++++++
 trunk/arch/arm/boot/dts/omap3.dtsi                 |  5 +++++
 trunk/arch/arm/boot/dts/omap4.dtsi                 |  5 +++++
 4 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 trunk/Documentation/devicetree/bindings/watchdog/omap-wdt.txt

diff --git a/[refs] b/[refs]
index 1c9c297a0d5e..45c65d650708 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3319f697154dfd1b44ab5da73970db9206da14db
+refs/heads/master: 94c30732944a03c5d4249abefbea09147579fb92
diff --git a/trunk/Documentation/devicetree/bindings/watchdog/omap-wdt.txt b/trunk/Documentation/devicetree/bindings/watchdog/omap-wdt.txt
new file mode 100644
index 000000000000..c227970671ea
--- /dev/null
+++ b/trunk/Documentation/devicetree/bindings/watchdog/omap-wdt.txt
@@ -0,0 +1,14 @@
+TI Watchdog Timer (WDT) Controller for OMAP
+
+Required properties:
+compatible:
+- "ti,omap3-wdt" for OMAP3
+- "ti,omap4-wdt" for OMAP4
+- ti,hwmods: Name of the hwmod associated to the WDT
+
+Examples:
+
+wdt2: wdt@4a314000 {
+	compatible = "ti,omap4-wdt", "ti,omap3-wdt";
+	ti,hwmods = "wd_timer2";
+};
diff --git a/trunk/arch/arm/boot/dts/omap3.dtsi b/trunk/arch/arm/boot/dts/omap3.dtsi
index 99474fa5fac4..810947198208 100644
--- a/trunk/arch/arm/boot/dts/omap3.dtsi
+++ b/trunk/arch/arm/boot/dts/omap3.dtsi
@@ -215,5 +215,10 @@
 			compatible = "ti,omap3-hsmmc";
 			ti,hwmods = "mmc3";
 		};
+
+		wdt2: wdt@48314000 {
+			compatible = "ti,omap3-wdt";
+			ti,hwmods = "wd_timer2";
+		};
 	};
 };
diff --git a/trunk/arch/arm/boot/dts/omap4.dtsi b/trunk/arch/arm/boot/dts/omap4.dtsi
index 359c4979c8aa..366464173476 100644
--- a/trunk/arch/arm/boot/dts/omap4.dtsi
+++ b/trunk/arch/arm/boot/dts/omap4.dtsi
@@ -272,5 +272,10 @@
 			ti,hwmods = "mmc5";
 			ti,needs-special-reset;
 		};
+
+		wdt2: wdt@4a314000 {
+			compatible = "ti,omap4-wdt", "ti,omap3-wdt";
+			ti,hwmods = "wd_timer2";
+		};
 	};
 };