summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/sleep-t3.S
diff options
context:
space:
mode:
authorBo Yan <byan@nvidia.com>2012-04-30 11:48:51 -0700
committerVarun Wadekar <vwadekar@nvidia.com>2012-06-27 17:28:48 +0530
commit170fc34a8f96552122231be6ed23a65584ea0310 (patch)
treefd241dfc8fa0a57b67790918ecec0c82938f2fc5 /arch/arm/mach-tegra/sleep-t3.S
parent7f01959d32aef2a43c7fcb42d0da3641ce641cbf (diff)
ARM: tegra11: Use wfi for power gating
Change-Id: I2331b92848c86f09866850d19d5b8a63d9190bca Signed-off-by: Bo Yan <byan@nvidia.com> Reviewed-on: http://git-master/r/99691 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Aleksandr Frid <afrid@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/sleep-t3.S')
-rw-r--r--arch/arm/mach-tegra/sleep-t3.S10
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/sleep-t3.S b/arch/arm/mach-tegra/sleep-t3.S
index 78f97d7d9c80..8c931348df2e 100644
--- a/arch/arm/mach-tegra/sleep-t3.S
+++ b/arch/arm/mach-tegra/sleep-t3.S
@@ -162,7 +162,11 @@ ENTRY(tegra3_cpu_reset)
/* Clear this CPU's "event" and "interrupt" flags and power gate
it when halting but not before it is in the "WFE" state. */
movw r12, FLOW_CTRL_CSR_INTR_FLAG | FLOW_CTRL_CSR_EVENT_FLAG | FLOW_CTRL_CSR_ENABLE
- mov r4, #(1 << 4)
+#if defined(CONFIG_ARCH_TEGRA_11x_SOC)
+ mov r4, #(1 << 8) @ wfi bitmap
+#else
+ mov r4, #(1 << 4) @ wfe bitmap
+#endif
orr r12, r12, r4, lsl r3
str r12, [r1]
@@ -184,7 +188,11 @@ delay_1:
__cpu_reset_again:
dsb
.align 5
+#if defined(CONFIG_ARCH_TEGRA_11x_SOC)
+ wfi @ CPU should be power gated here
+#else
wfe @ CPU should be power gated here
+#endif
wfe_war:
b __cpu_reset_again