summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorArchit Taneja <archit@ti.com>2010-09-22 16:45:00 +0530
committerRicardo Perez Olivares <x0081762@ti.com>2010-09-27 17:10:26 -0500
commit95309c8cf88f6435eccb136395c42d515b6dbe52 (patch)
tree90e427aae414e4c37ea83f0d9daa1a182bf8882b /arch
parentd1548238b1566cf831ed206e41aedee0cda60548 (diff)
DSS2/PM: Call omap_dss_resume_idle after relinquishing gpio
In the resume from idle path, dss opt clocks should be enabled only after resmuing gpio related clocks, this is because dss uses gpio lines. Signed-off-by: Archit Taneja <archit@ti.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/pm44xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c
index 6e6e9b6b8687..1adc94d4ca5d 100644
--- a/arch/arm/mach-omap2/pm44xx.c
+++ b/arch/arm/mach-omap2/pm44xx.c
@@ -176,12 +176,12 @@ void omap4_enter_sleep(unsigned int cpu, unsigned int power_state)
OMAP4430_CM2_CKGEN_MOD, OMAP4_CM_DIV_M3_DPLL_PER_OFFSET);
if (core_next_state < PWRDM_POWER_ON) {
- omap_dss_resume_idle();
omap2_gpio_resume_after_idle(0);
omap_uart_resume_idle(0);
omap_uart_resume_idle(1);
omap_uart_resume_idle(2);
omap_uart_resume_idle(3);
+ omap_dss_resume_idle();
}
return;