[09/17] ARM: imx: select ARM_CPU_SUSPEND if necessary

Message ID 1349195816-2225-10-git-send-email-arnd@arndb.de
State New
Headers show

Commit Message

Arnd Bergmann Oct. 2, 2012, 4:36 p.m.
As tests using 'make randconfig' showed, imx5 requires the same logic
as imx6 to select ARM_CPU_SUSPEND when building with power management
enabled.

The defconfig does not have this problem because it enables imx6
as well, but disabling it leads to this warning:

arch/arm/mach-imx/built-in.o: In function `v7_cpu_resume':
arch/arm/mach-imx/head-v7.S:104: undefined reference to `cpu_resume'

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/mach-imx/Kconfig |    1 +
 1 file changed, 1 insertion(+)

Patch

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index afd542a..8e96573 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -89,6 +89,7 @@  config SOC_IMX5
 	select ARCH_MXC_IOMUX_V3
 	select ARCH_HAS_CPUFREQ
 	select ARCH_MX5
+	select ARM_CPU_SUSPEND if PM
 	bool
 
 config SOC_IMX50