summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2011-03-03 12:16:23 +0100
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-03-11 14:46:29 +0100
commit85604b0a247615157cedfec46b9cbfde2884f80f (patch)
treeec88ac187104b424ccc00cec4a2846573b25cbeb
parentHACK: OMAP: DSS2: Fix OMAP2_DSS_USE_DSI_PLL (diff)
downloadlinux-85604b0a247615157cedfec46b9cbfde2884f80f.tar.xz
linux-85604b0a247615157cedfec46b9cbfde2884f80f.zip
HACK: OMAP: DSS2: add delay after enabling clocks
On omap4 the registers may not be accessible right after enabling the clocks. At some point this will be handled by pm_runtime, but, for the time begin, adding a small delay after clk_enable() should make things work. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r--drivers/video/omap2/dss/dss.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index e5da050bcf85..2be4d03ece43 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -850,6 +850,14 @@ void dss_clk_enable(enum dss_clock clks)
dss_clk_enable_no_ctx(clks);
+ /*
+ * HACK: On omap4 the registers may not be accessible right after
+ * enabling the clocks. At some point this will be handled by
+ * pm_runtime, but for the time begin this should make things work.
+ */
+ if (cpu_is_omap44xx() && check_ctx)
+ udelay(10);
+
if (check_ctx && cpu_is_omap34xx() && dss_need_ctx_restore())
restore_all_ctx();
}