From 66e0004bc4423ee29ae49b8ce6316d00f1cb6625 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Fri, 16 Mar 2012 09:53:24 +0000
Subject: [PATCH] --- yaml --- r: 296708 b: refs/heads/master c:
 71de5c46e0600b72df58269e80da343e354ddbd7 h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/arch/arm/boot/dts/db8500.dtsi |  6 ++++++
 trunk/arch/arm/mach-ux500/timer.c   | 11 ++++++++---
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b918ffdfa405..5f9748d4877f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15daf691e8e0119e6c21d3ddf6b4754e66e37365
+refs/heads/master: 71de5c46e0600b72df58269e80da343e354ddbd7
diff --git a/trunk/arch/arm/boot/dts/db8500.dtsi b/trunk/arch/arm/boot/dts/db8500.dtsi
index a81cce0f755e..d73dce645667 100644
--- a/trunk/arch/arm/boot/dts/db8500.dtsi
+++ b/trunk/arch/arm/boot/dts/db8500.dtsi
@@ -42,6 +42,12 @@
 			interrupts = <0 7 0x4>;
 		};
 
+		timer@a0410600 {
+			compatible = "arm,cortex-a9-twd-timer";
+			reg = <0xa0410600 0x20>;
+			interrupts = <1 13 0x304>;
+		};
+
 		rtc@80154000 {
 			compatible = "stericsson,db8500-rtc";
 			reg = <0x80154000 0x1000>;
diff --git a/trunk/arch/arm/mach-ux500/timer.c b/trunk/arch/arm/mach-ux500/timer.c
index e9d580702fbb..d37df98b5c32 100644
--- a/trunk/arch/arm/mach-ux500/timer.c
+++ b/trunk/arch/arm/mach-ux500/timer.c
@@ -7,6 +7,7 @@
 #include <linux/io.h>
 #include <linux/errno.h>
 #include <linux/clksrc-dbx500-prcmu.h>
+#include <linux/of.h>
 
 #include <asm/smp_twd.h>
 
@@ -30,9 +31,13 @@ static void __init ux500_twd_init(void)
 	twd_local_timer = cpu_is_u5500() ? &u5500_twd_local_timer :
 					   &u8500_twd_local_timer;
 
-	err = twd_local_timer_register(twd_local_timer);
-	if (err)
-		pr_err("twd_local_timer_register failed %d\n", err);
+	if (of_have_populated_dt())
+		twd_local_timer_of_register();
+	else {
+		err = twd_local_timer_register(twd_local_timer);
+		if (err)
+			pr_err("twd_local_timer_register failed %d\n", err);
+	}
 }
 #else
 #define ux500_twd_init()	do { } while(0)