From db350252e209ec9cffc478c1c92804501a4a8079 Mon Sep 17 00:00:00 2001 From: Huang Jiachai Date: Mon, 21 Sep 2015 15:40:13 +0800 Subject: [PATCH] video: rockchip: lcdc: 3288: delele some special config for vop full v1.0 Change-Id: Iec4db13e5cde5567d9c9a96f3e063ceb3656b256 Signed-off-by: Huang Jiachai --- drivers/video/rockchip/lcdc/rk3288_lcdc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/video/rockchip/lcdc/rk3288_lcdc.c b/drivers/video/rockchip/lcdc/rk3288_lcdc.c index 847f9184335a..95ab2ef706a4 100755 --- a/drivers/video/rockchip/lcdc/rk3288_lcdc.c +++ b/drivers/video/rockchip/lcdc/rk3288_lcdc.c @@ -808,7 +808,8 @@ static int rk3288_win_0_1_reg_update(struct rk_lcdc_driver *dev_drv,int win_id) struct rk_lcdc_win *win = dev_drv->win[win_id]; unsigned int mask, val, off; off = win_id * 0x40; - if(win->win_lb_mode == 5) + if((win->win_lb_mode == 5) && + (dev_drv->version == VOP_FULL_RK3288_V1_0)) win->win_lb_mode = 4; if(win->state == 1){ @@ -3381,13 +3382,15 @@ static int rk3288_lcdc_config_done(struct rk_lcdc_driver *dev_drv) if ((win->state == 0)&&(win->last_state == 1)) { switch (win->id) { case 0: - lcdc_writel(lcdc_dev,WIN0_CTRL1,0x0); + if (dev_drv->version == VOP_FULL_RK3288_V1_0) + lcdc_writel(lcdc_dev, WIN0_CTRL1, 0x0); mask = m_WIN0_EN; val = v_WIN0_EN(0); lcdc_msk_reg(lcdc_dev, WIN0_CTRL0, mask,val); break; case 1: - lcdc_writel(lcdc_dev,WIN1_CTRL1,0x0); + if (dev_drv->version == VOP_FULL_RK3288_V1_0) + lcdc_writel(lcdc_dev, WIN1_CTRL1, 0x0); mask = m_WIN1_EN; val = v_WIN1_EN(0); lcdc_msk_reg(lcdc_dev, WIN1_CTRL0, mask,val); -- 2.34.1