diff options
author | Jouni Hogander <jouni.hogander@nokia.com> | 2009-09-22 19:46:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 10:39:50 -0400 |
commit | 48a00e7fe9a6abeedb62c99ca7b7860754aae3d8 (patch) | |
tree | 05d4918a4867f0e28d37a647946a2ee8fb8a24f1 /drivers | |
parent | f9e2bc8d7b8c2d9dd05a6702fce77aca3d4f2320 (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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c index a85694900e44..04b7b8ae5583 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, | |||
1395 | enable_digit_clocks(0); | 1395 | enable_digit_clocks(0); |
1396 | } | 1396 | } |
1397 | 1397 | ||
1398 | /* Enable smart idle and autoidle */ | 1398 | /* Enable smart standby/idle, autoidle and wakeup */ |
1399 | l = dispc_read_reg(DISPC_SYSCONFIG); | 1399 | l = dispc_read_reg(DISPC_SYSCONFIG); |
1400 | l &= ~((3 << 12) | (3 << 3)); | 1400 | l &= ~((3 << 12) | (3 << 3)); |
1401 | l |= (2 << 12) | (2 << 3) | (1 << 0); | 1401 | l |= (2 << 12) | (2 << 3) | (1 << 2) | (1 << 0); |
1402 | dispc_write_reg(DISPC_SYSCONFIG, l); | 1402 | dispc_write_reg(DISPC_SYSCONFIG, l); |
1403 | omap_writel(1 << 0, DSS_BASE + DSS_SYSCONFIG); | 1403 | omap_writel(1 << 0, DSS_BASE + DSS_SYSCONFIG); |
1404 | 1404 | ||