Skip to content

Commit

Permalink
ARM: 8434/2: Revert "7655/1: smp_twd: make twd_local_timer_of_registe…
Browse files Browse the repository at this point in the history
…r() no-op for nosmp"

This reverts commit 904464b.

The problem pointed out by commit 904464b ("ARM: 7655/1:
smp_twd: make twd_local_timer_of_register() no-op for nosmp")
doesn't exist anymore.

We can safely boot with nosmp and the warning won't show up.

The other side benefit of this patch is that TWD has a chance
to probe on single-core A9 systems such as AM437x which sport
TWD.

While at that, also drop SMP dependency from TWD's Kconfig entry.

Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Dirk Behme <dirk.behme@de.bosch.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Felipe Balbi authored and Russell King committed Oct 3, 2015
1 parent 6ff0966 commit 63c27ae
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 5 deletions.
1 change: 0 additions & 1 deletion arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1410,7 +1410,6 @@ config HAVE_ARM_ARCH_TIMER

config HAVE_ARM_TWD
bool
depends on SMP
select CLKSRC_OF if OF
help
This options enables support for the ARM timer and watchdog unit
Expand Down
4 changes: 0 additions & 4 deletions arch/arm/kernel/smp_twd.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <linux/of_irq.h>
#include <linux/of_address.h>

#include <asm/smp_plat.h>
#include <asm/smp_twd.h>

/* set up by the platform code */
Expand Down Expand Up @@ -392,9 +391,6 @@ static void __init twd_local_timer_of_register(struct device_node *np)
{
int err;

if (!is_smp() || !setup_max_cpus)
return;

twd_ppi = irq_of_parse_and_map(np, 0);
if (!twd_ppi) {
err = -EINVAL;
Expand Down

0 comments on commit 63c27ae

Please sign in to comment.