aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tegra/cpuidle-tegra20.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-tegra/cpuidle-tegra20.c')
-rw-r--r--arch/arm/mach-tegra/cpuidle-tegra20.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
index 88de2dce2e87..7469347b1749 100644
--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
@@ -34,6 +34,7 @@
34#include "iomap.h" 34#include "iomap.h"
35#include "irq.h" 35#include "irq.h"
36#include "pm.h" 36#include "pm.h"
37#include "reset.h"
37#include "sleep.h" 38#include "sleep.h"
38 39
39#ifdef CONFIG_PM_SLEEP 40#ifdef CONFIG_PM_SLEEP
@@ -70,15 +71,13 @@ static struct cpuidle_driver tegra_idle_driver = {
70 71
71#ifdef CONFIG_PM_SLEEP 72#ifdef CONFIG_PM_SLEEP
72#ifdef CONFIG_SMP 73#ifdef CONFIG_SMP
73static void __iomem *pmc = IO_ADDRESS(TEGRA_PMC_BASE);
74
75static int tegra20_reset_sleeping_cpu_1(void) 74static int tegra20_reset_sleeping_cpu_1(void)
76{ 75{
77 int ret = 0; 76 int ret = 0;
78 77
79 tegra_pen_lock(); 78 tegra_pen_lock();
80 79
81 if (readl(pmc + PMC_SCRATCH41) == CPU_RESETTABLE) 80 if (readb(tegra20_cpu1_resettable_status) == CPU_RESETTABLE)
82 tegra20_cpu_shutdown(1); 81 tegra20_cpu_shutdown(1);
83 else 82 else
84 ret = -EINVAL; 83 ret = -EINVAL;