commit a4b351b2c68de091b2bec5ea3c6d6fda359dddd6
author Linux Build Service Account <lnxbuild@localhost> Wed Jul 10 06:34:50 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jul 10 06:34:50 2013 -0700
tree 4dd44391f9aa4de48f5af1e7e4dedaab409bc8c7
parent 1bd49a8fa8c7d76c46788b7a1d27cc417e8e60ae
parent 1da7ee48202ea377086e7b17a6617b9ee6002f77

Merge "msm: idle-v7: Add support to pass tz flag when core is hotplugged" into msm-3.4

arch/arm/mach-msm/idle-v7.S

diff --git a/arch/arm/mach-msm/idle-v7.S b/arch/arm/mach-msm/idle-v7.S
index 5d25134..f8a32b4 100644
--- a/arch/arm/mach-msm/idle-v7.S
+++ b/arch/arm/mach-msm/idle-v7.S
@@ -25,6 +25,7 @@
 #ifdef CONFIG_MSM_SCM
 #define SCM_SVC_BOOT 0x1
 #define SCM_CMD_TERMINATE_PC 0x2
+#define SCM_CMD_CORE_HOTPLUGGED 0x10
 #endif
 
 ENTRY(msm_arch_idle)
@@ -99,7 +100,7 @@
 #ifdef CONFIG_MSM_SCM
 	ldr	r0, =SCM_SVC_BOOT
 	ldr	r1, =SCM_CMD_TERMINATE_PC
-	mov	r2, #0
+	ldr	r2, =SCM_CMD_CORE_HOTPLUGGED
 	bl	scm_call_atomic1
 #else
 	mrc     p15, 0, r3, c1, c0, 0    /* read current CR    */