summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/pm.c
diff options
context:
space:
mode:
authorJin Qian <jqian@nvidia.com>2011-08-23 18:15:32 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:48:50 -0800
commit9d5db80b8fbfd5454a9927a19d6e3ce2432bec9e (patch)
tree74219a87cdc8add4b7c2176dfac83a67b162e28f /arch/arm/mach-tegra/pm.c
parentf4292da9e98e5707730264f8ddba867c6d9a2aa6 (diff)
ARM: tegra: power: restore reset handler after lp0
Bug 862504 Change-Id: I910f4f229a2040d13d79e2a4f64fd2558509d9e7 Reviewed-on: http://git-master/r/50241 Reviewed-by: Jin Qian <jqian@nvidia.com> Tested-by: Jin Qian <jqian@nvidia.com> Reviewed-by: Aleksandr Frid <afrid@nvidia.com> Reviewed-by: Scott Williams <scwilliams@nvidia.com> Rebase-Id: R3c4d055f1c2ebad76ad2a9305d5e02f5a4411400
Diffstat (limited to 'arch/arm/mach-tegra/pm.c')
-rw-r--r--arch/arm/mach-tegra/pm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/pm.c b/arch/arm/mach-tegra/pm.c
index ab00f9b6f78d..63b9b7d613fd 100644
--- a/arch/arm/mach-tegra/pm.c
+++ b/arch/arm/mach-tegra/pm.c
@@ -777,6 +777,7 @@ int tegra_suspend_dram(enum tegra_suspend_mode mode, unsigned int flags)
if (mode == TEGRA_SUSPEND_LP0) {
tegra_lp0_cpu_mode(true);
tegra_lp0_suspend_mc();
+ tegra_cpu_reset_handler_save();
}
suspend_cpu_complex(flags);
@@ -796,6 +797,7 @@ int tegra_suspend_dram(enum tegra_suspend_mode mode, unsigned int flags)
tegra_init_cache();
if (mode == TEGRA_SUSPEND_LP0) {
+ tegra_cpu_reset_handler_restore();
tegra_lp0_resume_mc();
tegra_lp0_cpu_mode(false);
} else if (mode == TEGRA_SUSPEND_LP1)