From c6d2af7e84c8ce2b6d5d7117f44ed14eece1412e Mon Sep 17 00:00:00 2001 From: hjc Date: Thu, 25 Jul 2013 14:33:40 +0800 Subject: [PATCH] rk3188 lcdc: fix compile error --- drivers/video/rockchip/lcdc/rk3188_lcdc.c | 2 ++ drivers/video/rockchip/lcdc/rk3188_lcdc.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/video/rockchip/lcdc/rk3188_lcdc.c b/drivers/video/rockchip/lcdc/rk3188_lcdc.c index 6b16fcf8eab6..41548f2ebd31 100755 --- a/drivers/video/rockchip/lcdc/rk3188_lcdc.c +++ b/drivers/video/rockchip/lcdc/rk3188_lcdc.c @@ -632,6 +632,7 @@ static int rk3188_load_screen(struct rk_lcdc_device_driver *dev_drv, bool initsc v_VASP(screen->vsync_len + screen->upper_margin)); } spin_unlock(&lcdc_dev->reg_lock); + #ifdef CONFIG_ARCH_RK3026 if(dev_drv->screen0->type == SCREEN_RGB) //iomux for RGB screen { iomux_set(LCDC0_DCLK); @@ -653,6 +654,7 @@ static int rk3188_load_screen(struct rk_lcdc_device_driver *dev_drv, bool initsc iomux_set(LCDC0_D22); iomux_set(LCDC0_D23); } + #endif ret = clk_set_rate(lcdc_dev->dclk, screen->pixclock); if(ret) { diff --git a/drivers/video/rockchip/lcdc/rk3188_lcdc.h b/drivers/video/rockchip/lcdc/rk3188_lcdc.h index be728a6a12ca..868d2c0b5c80 100755 --- a/drivers/video/rockchip/lcdc/rk3188_lcdc.h +++ b/drivers/video/rockchip/lcdc/rk3188_lcdc.h @@ -292,7 +292,7 @@ RK3026/RK3028A max output resolution 1920x1080 support IEP instead of 3d */ -#ifdef CONFIG_ARCH_RK3026 +//#ifdef CONFIG_ARCH_RK3026 //SYS_CTRL 0x00 #define m_DIRECT_PATCH_EN (1<<11) #define m_DIRECT_PATH_LAY_SEL (1<<12) @@ -314,7 +314,7 @@ #define v_WIN1_EMPTY_INTR_CLR(x) (((x)&1)<<27) #define v_WIN0_EMPTY_INTR_STA(x) (((x)&1)<<28) #define v_WIN1_EMPTY_INTR_STA(x) (((x)&1)<<29) -#endif +//#endif #define CalScale(x, y) ((((u32)(x-1))*0x1000)/(y-1)) -- 2.34.1