diff options
| -rw-r--r-- | arch/arm/mach-tegra/pm.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/sleep-tegra20.S | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/pm.c b/arch/arm/mach-tegra/pm.c index 0494f739c95f..04a8e06f59a9 100644 --- a/arch/arm/mach-tegra/pm.c +++ b/arch/arm/mach-tegra/pm.c | |||
| @@ -162,6 +162,11 @@ bool tegra_set_cpu_in_lp2(int phy_cpu_id) | |||
| 162 | return last_cpu; | 162 | return last_cpu; |
| 163 | } | 163 | } |
| 164 | 164 | ||
| 165 | int tegra_cpu_do_idle(void) | ||
| 166 | { | ||
| 167 | return cpu_do_idle(); | ||
| 168 | } | ||
| 169 | |||
| 165 | static int tegra_sleep_cpu(unsigned long v2p) | 170 | static int tegra_sleep_cpu(unsigned long v2p) |
| 166 | { | 171 | { |
| 167 | /* Switch to the identity mapping. */ | 172 | /* Switch to the identity mapping. */ |
diff --git a/arch/arm/mach-tegra/sleep-tegra20.S b/arch/arm/mach-tegra/sleep-tegra20.S index 9f6bfafdd512..e3f2417c420e 100644 --- a/arch/arm/mach-tegra/sleep-tegra20.S +++ b/arch/arm/mach-tegra/sleep-tegra20.S | |||
| @@ -197,7 +197,7 @@ ENTRY(tegra20_sleep_cpu_secondary_finish) | |||
| 197 | mov r3, #CPU_RESETTABLE | 197 | mov r3, #CPU_RESETTABLE |
| 198 | str r3, [r0] | 198 | str r3, [r0] |
| 199 | 199 | ||
| 200 | bl cpu_do_idle | 200 | bl tegra_cpu_do_idle |
| 201 | 201 | ||
| 202 | /* | 202 | /* |
| 203 | * cpu may be reset while in wfi, which will return through | 203 | * cpu may be reset while in wfi, which will return through |
