ENGR00287579 mxsfb: i.MX6SL clean master bit before enter suspend

Clean lcdif bus master bit when lcdif enter low power mode.
Restore the master bit when lcdif back to work mode.

Signed-off-by: Sandor Yu <R01008@freescale.com>

diff --git a/drivers/video/fbdev/mxsfb.c b/drivers/video/fbdev/mxsfb.c
index ef4e750578fc309db6948c451030c2d8d78be2d0..09bfd79748f9b1f9138d5127e34c426716e5090e 100644 (file)
--- a/drivers/video/fbdev/mxsfb.c
+++ b/drivers/video/fbdev/mxsfb.c
@@ -366,6 +366,7 @@ static void mxsfb_enable_controller(struct fb_info *fb_info)
        reg |= VDCTRL4_SYNC_SIGNALS_ON;
        writel(reg, host->base + LCDC_VDCTRL4);
 
+       writel(CTRL_MASTER, host->base + LCDC_CTRL + REG_SET);
        writel(CTRL_RUN, host->base + LCDC_CTRL + REG_SET);
 
        host->enabled = 1;
@@ -395,6 +396,8 @@ static void mxsfb_disable_controller(struct fb_info *fb_info)
                loop--;
        }
 
+       writel(CTRL_MASTER, host->base + LCDC_CTRL + REG_CLR);
+
        reg = readl(host->base + LCDC_VDCTRL4);
        writel(reg & ~VDCTRL4_SYNC_SIGNALS_ON, host->base + LCDC_VDCTRL4);
 
@@ -980,6 +983,7 @@ static void mxsfb_shutdown(struct platform_device *pdev)
         * might interfere with the BootROM's boot mode pads sampling.
         */
        writel(CTRL_RUN, host->base + LCDC_CTRL + REG_CLR);
+       writel(CTRL_MASTER, host->base + LCDC_CTRL + REG_CLR);
        clk_disable_axi(host);
 }