aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/timer.c
diff options
context:
space:
mode:
authorSantosh Shilimkar <santosh.shilimkar@ti.com>2012-07-04 09:02:32 -0400
committerBenoit Cousson <b-cousson@ti.com>2012-09-07 13:18:43 -0400
commiteed0de27726a55f145490619510c8ec58c9dc767 (patch)
tree76cd4609a74b50cbc059eefb30a65dd2aee0118c /arch/arm/mach-omap2/timer.c
parent926fd45ba9eeb4c3d0454b934161ee884dd82a22 (diff)
ARM: OMAP4: Add local timer support for Device Tree
Add cortex-a9 local timer support for all OMAP4 based SOCs using DT. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
-rw-r--r--arch/arm/mach-omap2/timer.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 2ff6d41ec6c6..31f9c936125f 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -36,6 +36,7 @@
36#include <linux/clocksource.h> 36#include <linux/clocksource.h>
37#include <linux/clockchips.h> 37#include <linux/clockchips.h>
38#include <linux/slab.h> 38#include <linux/slab.h>
39#include <linux/of.h>
39 40
40#include <asm/mach/time.h> 41#include <asm/mach/time.h>
41#include <plat/dmtimer.h> 42#include <plat/dmtimer.h>
@@ -386,6 +387,11 @@ static void __init omap4_timer_init(void)
386 if (omap_rev() != OMAP4430_REV_ES1_0) { 387 if (omap_rev() != OMAP4430_REV_ES1_0) {
387 int err; 388 int err;
388 389
390 if (of_have_populated_dt()) {
391 twd_local_timer_of_register();
392 return;
393 }
394
389 err = twd_local_timer_register(&twd_local_timer); 395 err = twd_local_timer_register(&twd_local_timer);
390 if (err) 396 if (err)
391 pr_err("twd_local_timer_register failed %d\n", err); 397 pr_err("twd_local_timer_register failed %d\n", err);