From 6ee205234067d8e065b12aebd40bbdb65e6be406 Mon Sep 17 00:00:00 2001
From: "Kumar, Anil" <anilkumar.v@ti.com>
Date: Wed, 6 Feb 2013 09:30:03 +0530
Subject: [PATCH] --- yaml --- r: 355779 b: refs/heads/master c:
 518f97dbb8d047f54c9f9f9b970fb42e1a6c8184 h: refs/heads/master i:   355777:
 19f466699af2da4ea7780a31695d4e25e2de60b0   355775:
 1adf1e2fd25ecf94fc0b86091d28aad5e64c05e3 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/arm/boot/dts/da850-evm.dts  | 3 +++
 trunk/arch/arm/boot/dts/da850.dtsi     | 5 +++++
 trunk/arch/arm/mach-davinci/da8xx-dt.c | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f6ed6db90b27..6b39fcf19db5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01729ccf19b3c136cd93f8837b0a2761c23da700
+refs/heads/master: 518f97dbb8d047f54c9f9f9b970fb42e1a6c8184
diff --git a/trunk/arch/arm/boot/dts/da850-evm.dts b/trunk/arch/arm/boot/dts/da850-evm.dts
index 0060903b2b78..f712fb607a42 100644
--- a/trunk/arch/arm/boot/dts/da850-evm.dts
+++ b/trunk/arch/arm/boot/dts/da850-evm.dts
@@ -36,6 +36,9 @@
 			pinctrl-names = "default";
 			pinctrl-0 = <&i2c0_pins>;
 		};
+		wdt: wdt@1c21000 {
+			status = "okay";
+		};
 	};
 	nand_cs3@62000000 {
 		status = "okay";
diff --git a/trunk/arch/arm/boot/dts/da850.dtsi b/trunk/arch/arm/boot/dts/da850.dtsi
index 9669e80cbada..3ec1bda64356 100644
--- a/trunk/arch/arm/boot/dts/da850.dtsi
+++ b/trunk/arch/arm/boot/dts/da850.dtsi
@@ -102,6 +102,11 @@
 			#size-cells = <0>;
 			status = "disabled";
 		};
+		wdt: wdt@1c21000 {
+			compatible = "ti,davinci-wdt";
+			reg = <0x21000 0x1000>;
+			status = "disabled";
+		};
 	};
 	nand_cs3@62000000 {
 		compatible = "ti,davinci-nand";
diff --git a/trunk/arch/arm/mach-davinci/da8xx-dt.c b/trunk/arch/arm/mach-davinci/da8xx-dt.c
index a1731f0f5b97..5404e92aeb1a 100644
--- a/trunk/arch/arm/mach-davinci/da8xx-dt.c
+++ b/trunk/arch/arm/mach-davinci/da8xx-dt.c
@@ -39,6 +39,7 @@ static void __init da8xx_init_irq(void)
 
 struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {
 	OF_DEV_AUXDATA("ti,davinci-i2c", 0x01c22000, "i2c_davinci.1", NULL),
+	OF_DEV_AUXDATA("ti,davinci-wdt", 0x01c21000, "watchdog", NULL),
 	{}
 };