From: Zheng Yang <zhengyang@rock-chips.com>
Date: Fri, 18 Jul 2014 02:09:05 +0000 (+0800)
Subject: rk3036 lcdc: disable standy mode when open layer from stanby mode.
X-Git-Tag: firefly_0821_release~4916^2~207
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8392e1bd06afc37ff680ee050cae61908c786fd0;p=firefly-linux-kernel-4.4.55.git

rk3036 lcdc: disable standy mode when open layer from stanby mode.
---

diff --git a/drivers/video/rockchip/lcdc/rk3036_lcdc.c b/drivers/video/rockchip/lcdc/rk3036_lcdc.c
index 8e113959f42d..dadd0d8a9b90 100644
--- a/drivers/video/rockchip/lcdc/rk3036_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk3036_lcdc.c
@@ -896,8 +896,11 @@ static int rk3036_lcdc_cfg_done(struct rk_lcdc_driver *dev_drv)
 	struct lcdc_device *lcdc_dev = container_of(dev_drv, 
 					struct lcdc_device, driver);
 	spin_lock(&lcdc_dev->reg_lock);
-	if (lcdc_dev->clk_on)
+	if (lcdc_dev->clk_on) {
+		lcdc_msk_reg(lcdc_dev, SYS_CTRL, m_LCDC_STANDBY,
+			     v_LCDC_STANDBY(lcdc_dev->standby));
 		lcdc_cfg_done(lcdc_dev);
+	}
 	spin_unlock(&lcdc_dev->reg_lock);
 	return 0;
 }