Subject: [GIT PULL 3/3] 3rd Round of Exynos-PM-2 Updates for v3.18

From: [email-masked] (Arnd Bergmann)
Date: Wed, 1 Oct 2014 18:01:29 +0200

On Thursday 25 September 2014, Kukjin Kim wrote:
> Exynos 2nd PM related updates for v3.18
> 
> - Firmware supporting suspend and resume to excute of low
>    level operations to enter and leave power mode for exynos
>    : introduce suspend() and resume() firmware operations
> 
> - Fix AFTR mode on boards with secure firmware enabled and
>    allows exynos cpuidle driver usage on exynos4x12 SoCs
> 
> - Fix build with PM_SLEEP=n and ARM_EXYNOS_CPUIDLE=y
> 
> - SWRESET is needed to boot secondary CPU on exynos3250
> 

I needed another fixup to make this build, but I'm not sure about
whether this is the right solution.

I decided not to pull this one, please test again with and without
my patch for the case that ARM_CPU_SUSPEND is disabled.

	Arnd

diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile
index 64324bf5edb4..aaab67d84bf6 100644
--- a/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@ -14,9 +14,9 @@ obj-				:=
 
 # Core
 
-obj-$(CONFIG_ARCH_EXYNOS)	+= exynos.o pmu.o exynos-smc.o firmware.o sleep.o
+obj-$(CONFIG_ARCH_EXYNOS)	+= exynos.o pmu.o exynos-smc.o firmware.o
 
-obj-$(CONFIG_EXYNOS_CPU_SUSPEND) += pm.o
+obj-$(CONFIG_EXYNOS_CPU_SUSPEND) += pm.o sleep.o
 obj-$(CONFIG_PM_SLEEP)		+= suspend.o
 obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o
 
diff --git a/arch/arm/mach-exynos/firmware.c b/arch/arm/mach-exynos/firmware.c
index 2c5bc6bfcbdf..b7ff8f25bf4a 100644
--- a/arch/arm/mach-exynos/firmware.c
+++ b/arch/arm/mach-exynos/firmware.c
@@ -129,11 +129,11 @@ static int exynos_resume(void)
 }
 
 static const struct firmware_ops exynos_firmware_ops = {
-	.do_idle		= exynos_do_idle,
+	.do_idle		= IS_ENABLED(CONFIG_EXYNOS_CPU_SUSPEND) ? exynos_do_idle : NULL,
 	.set_cpu_boot_addr	= exynos_set_cpu_boot_addr,
 	.cpu_boot		= exynos_cpu_boot,
-	.suspend		= exynos_suspend,
-	.resume			= exynos_resume,
+	.suspend		= IS_ENABLED(CONFIG_PM_SLEEP) ? exynos_suspend : NULL,
+	.resume			= IS_ENABLED(CONFIG_PM_SLEEP) ? exynos_resume : NULL,
 };
 
 void __init exynos_firmware_init(void)