summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJouni Hogander <jouni.hogander@nokia.com>2009-09-22 16:46:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-23 07:39:50 -0700
commit48a00e7fe9a6abeedb62c99ca7b7860754aae3d8 (patch)
tree05d4918a4867f0e28d37a647946a2ee8fb8a24f1 /drivers
parentf9e2bc8d7b8c2d9dd05a6702fce77aca3d4f2320 (diff)
omapfb: dispc: enable wake up capability
Without wakeup enable omap doesn't wake up on dispc interrupts. This causes problems in a case where mpu is in sleep state and dispc interrupt fires. Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Imre Deak <imre.deak@nokia.com> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/omap/dispc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
index a85694900e4..04b7b8ae558 100644
--- a/drivers/video/omap/dispc.c
+++ b/drivers/video/omap/dispc.c
@@ -1395,10 +1395,10 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode,
enable_digit_clocks(0);
}
- /* Enable smart idle and autoidle */
+ /* Enable smart standby/idle, autoidle and wakeup */
l = dispc_read_reg(DISPC_SYSCONFIG);
l &= ~((3 << 12) | (3 << 3));
- l |= (2 << 12) | (2 << 3) | (1 << 0);
+ l |= (2 << 12) | (2 << 3) | (1 << 2) | (1 << 0);
dispc_write_reg(DISPC_SYSCONFIG, l);
omap_writel(1 << 0, DSS_BASE + DSS_SYSCONFIG);