From 63c27ae7981e5c28abfe97ca5f6ef92a5070ce7a Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Fri, 2 Oct 2015 20:33:36 +0100 Subject: [PATCH] ARM: 8434/2: Revert "7655/1: smp_twd: make twd_local_timer_of_register() no-op for nosmp" This reverts commit 904464b91eca8c665acea033489225af02eeb75a. The problem pointed out by commit 904464b91eca ("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 Cc: Dirk Behme Acked-by: Tony Lindgren Signed-off-by: Felipe Balbi Signed-off-by: Russell King --- arch/arm/Kconfig | 1 - arch/arm/kernel/smp_twd.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 72ad724c67ae..f7bb1b73fd22 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -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 diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c index e9035cda1485..662ed88bc1f9 100644 --- a/arch/arm/kernel/smp_twd.c +++ b/arch/arm/kernel/smp_twd.c @@ -23,7 +23,6 @@ #include #include -#include #include /* 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; -- 2.20.1