---

yaml --- r: 374098 b: refs/heads/master c: 2b7da98 h: refs/heads/master v: v3
git-mirror · Apr 8, 2013 · 3748395 · 3748395
1 parent f0c2e72
commit 3748395
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 849ff89b7b6b9f99bdae27b8d841423b907451b9
+refs/heads/master: 2b7da98870bc3aad46b60b3e2f2cc316ee03a924
diff --git a/trunk/arch/arm/boot/dts/exynos5250.dtsi b/trunk/arch/arm/boot/dts/exynos5250.dtsi
@@ -78,6 +78,14 @@
 		interrupts = <1 9 0xf04>;
 	};
 
+	timer {
+		compatible = "arm,armv7-timer";
+		interrupts = <1 13 0xf08>,
+			     <1 14 0xf08>,
+			     <1 11 0xf08>,
+			     <1 10 0xf08>;
+	};
+
 	combiner:interrupt-controller@10440000 {
 		compatible = "samsung,exynos4210-combiner";
 		#interrupt-cells = <2>;