From: Jouni Hogander <jouni.hogander@xxxxxxxxx>
This fixes sluggish serial console.
Signed-off-by: Git administrator <gitowner@xxxxxxxxxxxxxxxxxxxxxxxx>
---
arch/arm/mach-omap2/cpuidle34xx.c | 2 +-
arch/arm/mach-omap2/pm34xx.c | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c
index a02da6d..b19d2eb 100644
--- a/arch/arm/mach-omap2/cpuidle34xx.c
+++ b/arch/arm/mach-omap2/cpuidle34xx.c
@@ -431,7 +431,7 @@ static int omap3_enter_idle(struct cpuidle_device *dev,
current_cx_state = *cx;
- if (cx->type == OMAP3_STATE_C0) {
+ if (cx->type == OMAP3_STATE_C0 || !omap_serial_can_sleep()) {
/* Do nothing for C0, not even a wfi */
return 0;
}
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index da6eae1..42fa546 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -398,8 +398,6 @@ int omap3_can_sleep(void)
return 0;
if (atomic_read(&sleep_block) > 0)
return 0;
- if (!omap_serial_can_sleep())
- return 0;
return 1;
}
@@ -478,6 +476,9 @@ static void omap3_pm_idle(void)
if (omap_irq_pending())
goto out;
+ if (!omap_serial_can_sleep())
+ goto out;
+
omap2_gpio_prepare_for_retention();
omap_serial_enable_clocks(0, 0);
--
1.6.0
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
