Skip to content

Commit

Permalink
ARM: ux500: Don't attempt to enable the Nomadik System Timer twice
Browse files Browse the repository at this point in the history
When booting with DT enabled we already call clocksource_of_init(),
which in turn calls the OF version of nmdk_timer_init().

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Lee Jones authored and Linus Walleij committed Sep 26, 2013
1 parent 8132ed1 commit 970eb8f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm/mach-ux500/timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ void __init ux500_timer_init(void)
* sched_clock with higher rating then MTU since is always-on.
*
*/

nmdk_timer_init(mtu_timer_base, IRQ_MTU0);
if (!of_have_populated_dt())
nmdk_timer_init(mtu_timer_base, IRQ_MTU0);
clksrc_dbx500_prcmu_init(prcmu_timer_base);
ux500_twd_init();
}

0 comments on commit 970eb8f

Please sign in to comment.