msm: Makefile: Compile pm-8x60.c and cpuidle for 9x15
Check to compile SCM related code only when CONFIG_MSM_SCM is defined.
Signed-off-by: Maheshkumar Sivasubramanian <msivasub@codeaurora.org>
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index a469e7d..a23aa8a 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -130,6 +130,7 @@
ifdef CONFIG_PM
obj-$(CONFIG_ARCH_MSM8960) += pm-8x60.o
obj-$(CONFIG_ARCH_MSM8X60) += pm-8x60.o
+ obj-$(CONFIG_ARCH_MSM9615) += pm-8x60.o
obj-$(CONFIG_ARCH_QSD8X50) += pm2.o
obj-$(CONFIG_ARCH_MSM7X30) += pm2.o
obj-$(CONFIG_ARCH_MSM7X27) += pm2.o
@@ -174,6 +175,7 @@
ifdef CONFIG_CPU_IDLE
obj-$(CONFIG_ARCH_MSM8960) += cpuidle.o
obj-$(CONFIG_ARCH_MSM8X60) += cpuidle.o
+ obj-$(CONFIG_ARCH_MSM9615) += cpuidle.o
endif
obj-$(CONFIG_ARCH_FSM9XXX) += devices-fsm9xxx.o
diff --git a/arch/arm/mach-msm/pm-8x60.c b/arch/arm/mach-msm/pm-8x60.c
index c86fe87..a929659 100644
--- a/arch/arm/mach-msm/pm-8x60.c
+++ b/arch/arm/mach-msm/pm-8x60.c
@@ -1173,7 +1173,7 @@
init_completion(&dev->cpu_killed);
#endif
}
-
+#ifdef CONFIG_MSM_SCM
ret = scm_set_boot_addr((void *)virt_to_phys(msm_pm_boot_entry),
SCM_FLAG_WARMBOOT_CPU0 | SCM_FLAG_WARMBOOT_CPU1);
if (ret) {
@@ -1181,6 +1181,7 @@
__func__, ret);
return ret;
}
+#endif
#ifdef CONFIG_MSM_IDLE_STATS
for_each_possible_cpu(cpu) {