[PATCH 20/41] ARM: ux500: Don't attempt to enable the Nomadik System Timer twice
Lee Jones
lee.jones at linaro.org
Wed Sep 18 08:14:17 EDT 2013
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 at linaro.org>
---
arch/arm/mach-ux500/timer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c
index b6bd0ef..05a4ff7 100644
--- a/arch/arm/mach-ux500/timer.c
+++ b/arch/arm/mach-ux500/timer.c
@@ -97,8 +97,8 @@ dt_fail:
* 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();
}
--
1.8.1.2
More information about the linux-arm-kernel
mailing list