diff options
author | Jin Qian <jqian@nvidia.com> | 2011-08-23 18:15:32 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 00:57:21 -0700 |
commit | ccdb0c9fccdfab29cc2183d0f8b4d37ff7f40e2a (patch) | |
tree | f3caea16ef262a40621035efc31348daa7752922 /arch/arm/mach-tegra/reset.c | |
parent | 7d7eb2611dcfa8734673dcfc3748bbaa9d65c18a (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/reset.c')
-rw-r--r-- | arch/arm/mach-tegra/reset.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/reset.c b/arch/arm/mach-tegra/reset.c index 853edde06b62..30efd2ca47b1 100644 --- a/arch/arm/mach-tegra/reset.c +++ b/arch/arm/mach-tegra/reset.c @@ -71,15 +71,13 @@ static void __init tegra_cpu_reset_handler_enable(void) } #ifdef CONFIG_PM_SLEEP -static unsigned long cpu_reset_handler_save[TEGRA_RESET_DATA_SIZE]; - void tegra_cpu_reset_handler_save(void) { unsigned int i; BUG_ON(!is_enabled); for (i = 0; i < TEGRA_RESET_DATA_SIZE; i++) - cpu_reset_handler_save[i] = - tegra_cpu_reset_handler_ptr[i]; + __tegra_cpu_reset_handler_data[i] = + tegra_cpu_reset_handler_ptr[i]; is_enabled = false; } @@ -87,9 +85,10 @@ void tegra_cpu_reset_handler_restore(void) { unsigned int i; BUG_ON(is_enabled); + tegra_cpu_reset_handler_enable(); for (i = 0; i < TEGRA_RESET_DATA_SIZE; i++) tegra_cpu_reset_handler_ptr[i] = - cpu_reset_handler_save[i]; + __tegra_cpu_reset_handler_data[i]; is_enabled = true; } #endif |