From 37483953e4ea88956c3cf715189a24f6b7e5875c Mon Sep 17 00:00:00 2001
From: Alexander Graf <[agraf@suse.de]>
Date: Thu, 4 Apr 2013 14:30:16 +0900
Subject: [PATCH] --- yaml --- r: 374098 b: refs/heads/master c:
 2b7da98870bc3aad46b60b3e2f2cc316ee03a924 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/boot/dts/exynos5250.dtsi | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6a5a57f1ca93..095c11268148 100644
--- 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
index 4352f5b336e9..0b130acb50ed 100644
--- 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>;