OMAPDSS: DISPC: Flush posted writes when enabling outputs

Flush posted write in _enable_lcd_out() and _enable_digit_out(). This
ensures the the lcd/digit bit is written before the code starts waiting
for interrupts about enabling/disabling the output.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 5c81533eacaa6224c3aed27d0c1e72a60616c3d7..5bbd838a657afdd29c252b6d220d7877c0b1313c 100644 (file)
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -1916,10 +1916,14 @@ static void dispc_disable_isr(void *data, u32 mask)
 
 static void _enable_lcd_out(enum omap_channel channel, bool enable)
 {
-       if (channel == OMAP_DSS_CHANNEL_LCD2)
+       if (channel == OMAP_DSS_CHANNEL_LCD2) {
                REG_FLD_MOD(DISPC_CONTROL2, enable ? 1 : 0, 0, 0);
-       else
+               /* flush posted write */
+               dispc_read_reg(DISPC_CONTROL2);
+       } else {
                REG_FLD_MOD(DISPC_CONTROL, enable ? 1 : 0, 0, 0);
+               dispc_read_reg(DISPC_CONTROL);
+       }
 }
 
 static void dispc_mgr_enable_lcd_out(enum omap_channel channel, bool enable)
@@ -1967,6 +1971,8 @@ static void dispc_mgr_enable_lcd_out(enum omap_channel channel, bool enable)
 static void _enable_digit_out(bool enable)
 {
        REG_FLD_MOD(DISPC_CONTROL, enable ? 1 : 0, 1, 1);
+       /* flush posted write */
+       dispc_read_reg(DISPC_CONTROL);
 }
 
 static void dispc_mgr_enable_digit_out(bool enable)