diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/pm24xx.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c index b8822f8b2891..6d63973c7f15 100644 --- a/arch/arm/mach-omap2/pm24xx.c +++ b/arch/arm/mach-omap2/pm24xx.c | |||
@@ -260,26 +260,6 @@ static int omap2_pm_begin(suspend_state_t state) | |||
260 | return 0; | 260 | return 0; |
261 | } | 261 | } |
262 | 262 | ||
263 | static int omap2_pm_suspend(void) | ||
264 | { | ||
265 | u32 wken_wkup, mir1; | ||
266 | |||
267 | wken_wkup = omap2_prm_read_mod_reg(WKUP_MOD, PM_WKEN); | ||
268 | wken_wkup &= ~OMAP24XX_EN_GPT1_MASK; | ||
269 | omap2_prm_write_mod_reg(wken_wkup, WKUP_MOD, PM_WKEN); | ||
270 | |||
271 | /* Mask GPT1 */ | ||
272 | mir1 = omap_readl(0x480fe0a4); | ||
273 | omap_writel(1 << 5, 0x480fe0ac); | ||
274 | |||
275 | omap2_enter_full_retention(); | ||
276 | |||
277 | omap_writel(mir1, 0x480fe0a4); | ||
278 | omap2_prm_write_mod_reg(wken_wkup, WKUP_MOD, PM_WKEN); | ||
279 | |||
280 | return 0; | ||
281 | } | ||
282 | |||
283 | static int omap2_pm_enter(suspend_state_t state) | 263 | static int omap2_pm_enter(suspend_state_t state) |
284 | { | 264 | { |
285 | int ret = 0; | 265 | int ret = 0; |
@@ -287,7 +267,7 @@ static int omap2_pm_enter(suspend_state_t state) | |||
287 | switch (state) { | 267 | switch (state) { |
288 | case PM_SUSPEND_STANDBY: | 268 | case PM_SUSPEND_STANDBY: |
289 | case PM_SUSPEND_MEM: | 269 | case PM_SUSPEND_MEM: |
290 | ret = omap2_pm_suspend(); | 270 | omap2_enter_full_retention(); |
291 | break; | 271 | break; |
292 | default: | 272 | default: |
293 | ret = -EINVAL; | 273 | ret = -EINVAL; |