diff options
| author | Bo Yan <byan@nvidia.com> | 2012-05-01 10:21:40 -0700 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-06-27 17:30:47 +0530 |
| commit | 2a8b9aa8e73766db763032caa049ec5988cd1ee2 (patch) | |
| tree | 1e010f6b3d1d9ad0f9da05d01382137716356074 /arch/arm/mach-tegra/sleep-t3.S | |
| parent | c88d7547daa0ce17a48347b5d102aeb0a8159f2b (diff) | |
ARM: tegra11: Fix wake-up condition
For immediate wake, always use WAITEVENT as the wake-up condition
bug 952631
Change-Id: Ie1fe9790c6559d3be41b30ad7c0792721140cf2e
Signed-off-by: Bo Yan <byan@nvidia.com>
Reviewed-on: http://git-master/r/99816
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
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.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/sleep-t3.S b/arch/arm/mach-tegra/sleep-t3.S index 8c931348df2e..62e8a23322ac 100644 --- a/arch/arm/mach-tegra/sleep-t3.S +++ b/arch/arm/mach-tegra/sleep-t3.S @@ -615,7 +615,13 @@ tegra3_enter_sleep: orr r0, r0, #FLOW_CTRL_CSR_ENABLE str r0, [r6, r2] +#if defined(CONFIG_ARCH_TEGRA_11x_SOC) + tst r0, #FLOW_CTRL_IMMEDIATE_WAKE + movne r0, #FLOW_CTRL_WAITEVENT + moveq r0, #FLOW_CTRL_WAIT_FOR_INTERRUPT +#else mov r0, #FLOW_CTRL_WAIT_FOR_INTERRUPT +#endif orr r0, r0, #FLOW_CTRL_HALT_CPU_IRQ | FLOW_CTRL_HALT_CPU_FIQ cpu_to_halt_reg r2, r1 str r0, [r6, r2] |