Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 970eb8fe authored by Lee Jones's avatar Lee Jones Committed by Linus Walleij
Browse files

ARM: ux500: Don't attempt to enable the Nomadik System Timer twice 



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: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 8132ed1b

arch/arm/mach-ux500/timer.c

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ void __init ux500_timer_init(void) 
	 * sched_clock with higher rating then MTU since is always-on.

	 *

	 */



	if (!of_have_populated_dt())

		nmdk_timer_init(mtu_timer_base, IRQ_MTU0);

	clksrc_dbx500_prcmu_init(prcmu_timer_base);

	ux500_twd_init();