diff options
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
-rw-r--r-- | arch/arm/mach-omap2/timer.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 25cbe73b0cd7..e2084facca59 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 <asm/smp_twd.h> | 42 | #include <asm/smp_twd.h> |
@@ -387,6 +388,11 @@ static void __init omap4_timer_init(void) | |||
387 | if (omap_rev() != OMAP4430_REV_ES1_0) { | 388 | if (omap_rev() != OMAP4430_REV_ES1_0) { |
388 | int err; | 389 | int err; |
389 | 390 | ||
391 | if (of_have_populated_dt()) { | ||
392 | twd_local_timer_of_register(); | ||
393 | return; | ||
394 | } | ||
395 | |||
390 | err = twd_local_timer_register(&twd_local_timer); | 396 | err = twd_local_timer_register(&twd_local_timer); |
391 | if (err) | 397 | if (err) |
392 | pr_err("twd_local_timer_register failed %d\n", err); | 398 | pr_err("twd_local_timer_register failed %d\n", err); |