aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJonas Aaberg <jonas.aberg@stericsson.com>2011-04-04 11:07:11 +0200
committerJonas ABERG <jonas.aberg@stericsson.com>2011-04-20 08:05:34 +0200
commit425ddd3e67c71b4f33aa9d60af0cc6110a50c2d5 (patch)
treed89742ea79d95af1976b3fa5905b325908861bdb /arch
parentc12aab246a99c34545d13b8fd270bd7f816d163d (diff)
ARM: ux500: Enable localtimers no matter number of cpus
Always use localtimers, no matter the number of cpus online. ST-Ericsson Linux next: Not tested, ask SSM for ER ST-Ericsson ID: ER332789 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: If3d9304c72a987c9e029da191e7da20878aa5d45 Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/19859
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-ux500/platsmp.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c
index 2b918557e7e..47bafde8611 100644
--- a/arch/arm/mach-ux500/platsmp.c
+++ b/arch/arm/mach-ux500/platsmp.c
@@ -193,12 +193,9 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
for (i = 0; i < max_cpus; i++)
set_cpu_present(i, true);
+ percpu_timer_setup();
+
if (max_cpus > 1) {
- /*
- * Enable the local timer or broadcast device for the
- * boot CPU, but only if we have more than one CPU.
- */
- percpu_timer_setup();
scu_enable(scu_base_addr());
wakeup_secondary();
}