---

yaml --- r: 373895 b: refs/heads/master c: 2f34e0a h: refs/heads/master i: 373893: 0993349 373891: a2ea87e 373887: 0a96e55 v: v3
git-mirror · Apr 4, 2013 · 7896ce3 · 7896ce3
1 parent f2953e0
commit 7896ce3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 889faa88142801ee6bec2de2b8fb4c606076d52f
+refs/heads/master: 2f34e0a58f34db094257e33b461d58b578004b67
diff --git a/trunk/arch/arm/boot/dts/zynq-7000.dtsi b/trunk/arch/arm/boot/dts/zynq-7000.dtsi
@@ -129,5 +129,12 @@
 			clock-names = "cpu_1x";
 			clock-ranges;
 		};
+		scutimer: scutimer@f8f00600 {
+			interrupt-parent = <&intc>;
+			interrupts = < 1 13 0x301 >;
+			compatible = "arm,cortex-a9-twd-timer";
+			reg = < 0xf8f00600 0x20 >;
+			clocks = <&cpu_clk 1>;
+		} ;
 	};
 };