Commit 63c27ae7 authored Oct 02, 2015 by Felipe Balbi Committed by Russell King Oct 03, 2015

ARM: 8434/2: Revert "7655/1: smp_twd: make twd_local_timer_of_register() no-op for nosmp"



This reverts commit 904464b9.

The problem pointed out by commit 904464b9 ("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>

parent 6ff09660

arch/arm/Kconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -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

arch/arm/kernel/smp_twd.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -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 */
		@@ -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;

Admin message