summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-exynos/Kconfig
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz2014-09-25 11:02:45 +0200
committerKukjin Kim2014-10-20 17:06:36 +0200
commit0d713cf1a6286aae6a12affab0887dbe2a4fbb83 (patch)
tree19a22890d12339ebfbd2d31fbe5843dc14cbc085 /arch/arm/mach-exynos/Kconfig
parentARM: EXYNOS: allow driver usage on Exynos4x12 SoCs (diff)
downloadkernel-qcow2-linux-0d713cf1a6286aae6a12affab0887dbe2a4fbb83.tar.gz
kernel-qcow2-linux-0d713cf1a6286aae6a12affab0887dbe2a4fbb83.tar.xz
kernel-qcow2-linux-0d713cf1a6286aae6a12affab0887dbe2a4fbb83.zip
ARM: EXYNOS: Fix build with PM_SLEEP=n and ARM_EXYNOS_CPUIDLE=y
Fix building of exynos_defconfig with CONFIG_PM_SLEEP disabled and CONFIG_ARM_EXYNOS_CPUIDLE enabled by: * adding EXYNOS_CPU_SUSPEND config option * always building sleep.o * building pm.o if EXYNOS_CPU_SUSPEND is enabled * moving suspend specific code from pm.c to suspend.c * enabling pm-common.o build also for EXYNOS_CPU_SUSPEND option [ Please note that there are no changes in the code moved from pm.c to suspend.c except making few functions non-static and cleaning up includes. ] Also while at it update Copyright dates. The build error messages: drivers/built-in.o: In function `exynos_enter_core0_aftr': /home/bzolnier/linux/drivers/cpuidle/cpuidle-exynos.c:36: undefined reference to `cpu_suspend' arch/arm/mach-exynos/built-in.o:(.data+0x74): undefined reference to `exynos_enter_aftr' make: *** [vmlinux] Error 1 This patch has been tested on Exynos4210 based Origen board. Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-exynos/Kconfig')
-rw-r--r--arch/arm/mach-exynos/Kconfig5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 2d0240f241b8..46f3c0d0d01f 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -123,4 +123,9 @@ config EXYNOS5420_MCPM
This is needed to provide CPU and cluster power management
on Exynos5420 implementing big.LITTLE.
+config EXYNOS_CPU_SUSPEND
+ bool
+ select ARM_CPU_SUSPEND
+ default PM_SLEEP || ARM_EXYNOS_CPUIDLE
+
endif