From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 3 Jun 2013 13:55:41 +0000 (+0200)
Subject: ARM: omap5: omap5 has SCU and TWD
X-Git-Tag: v3.11-rc1~12^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=896eba3ba41e1a978e9e47cf2837ef8963996bca;p=thirdparty%2Flinux.git

ARM: omap5: omap5 has SCU and TWD

These are selected by omap4 but used in common omap4/5
SMP code, so building an omap5-only kernel is actually
broken without this patch.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 1fdb462165902..1f8127afa7446 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -110,6 +110,8 @@ config SOC_OMAP5
 	select ARM_CPU_SUSPEND if PM
 	select ARM_GIC
 	select CPU_V7
+	select HAVE_ARM_SCU if SMP
+	select HAVE_ARM_TWD if LOCAL_TIMERS
 	select HAVE_SMP
 	select COMMON_CLK
 	select HAVE_ARM_ARCH_TIMER