openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Lee Jones 2013-09-18 08:55:19 +01:00 committed by Linus Walleij
parent 8132ed1bb8
commit 970eb8fe13
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-ux500/timer.c
View File

@ -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();
}