---

yaml --- r: 355779 b: refs/heads/master c: 518f97d h: refs/heads/master i: 355777: 19f4666 355775: 1adf1e2 v: v3
git-mirror · Feb 9, 2013 · 6ee2052 · 6ee2052
1 parent 46795f9
commit 6ee2052
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -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),
 	{}
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -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),
     	{}
     };
@@ Expand Down @@