diff options
| author | Lee Jones <lee.jones@linaro.org> | 2013-09-18 08:55:19 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-09-26 11:05:18 +0200 |
| commit | 970eb8fe135ed11e0805ceb0566a940d3eeccbca (patch) | |
| tree | eef0d5be3bc19e78d04e9bb4bca4a886bfda0ee7 | |
| parent | 8132ed1bb81471b3ced3cdcd7a7f46caff4c2a2f (diff) | |
| download | op-kernel-dev-970eb8fe135ed11e0805ceb0566a940d3eeccbca.zip op-kernel-dev-970eb8fe135ed11e0805ceb0566a940d3eeccbca.tar.gz | |
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>
| -rw-r--r-- | arch/arm/mach-ux500/timer.c | 4 |
1 files 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(); } |
