From: hjc <hjc@rock-chips.com>
Date: Thu, 20 Mar 2014 04:01:41 +0000 (+0800)
Subject: rk fb: fix support_uboot_display depend clk driver
X-Git-Tag: firefly_0821_release~5975
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=aed195e1bcfd26dd08c33c7cfc8db7c600303989;p=firefly-linux-kernel-4.4.55.git

rk fb: fix support_uboot_display depend clk driver
---

diff --git a/drivers/video/rockchip/lcdc/rk3288_lcdc.c b/drivers/video/rockchip/lcdc/rk3288_lcdc.c
index b0d2cec604f2..670109621a3e 100755
--- a/drivers/video/rockchip/lcdc/rk3288_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk3288_lcdc.c
@@ -208,7 +208,7 @@ static int rk3288_lcdc_pre_init(struct rk_lcdc_driver *dev_drv)
 	int *cbase = (int *)lcdc_dev->regs;
 	if (lcdc_dev->pre_init)
 		return 0;
-#ifdef CONFIG_RK_FPGA
+
 	lcdc_dev->hclk = devm_clk_get(lcdc_dev->dev, "hclk_lcdc");
 	lcdc_dev->aclk = devm_clk_get(lcdc_dev->dev, "aclk_lcdc");
 	lcdc_dev->dclk = devm_clk_get(lcdc_dev->dev, "dclk_lcdc");
@@ -218,7 +218,7 @@ static int rk3288_lcdc_pre_init(struct rk_lcdc_driver *dev_drv)
 		dev_err(lcdc_dev->dev, "failed to get lcdc%d clk source\n",
 			lcdc_dev->id);
 	}
-#endif
+
 	/*uboot display has enabled lcdc in boot */
 	if (!support_uboot_display()) {
 		rk_disp_pwr_enable(dev_drv);
@@ -1251,14 +1251,14 @@ static int rk3288_lcdc_pan_display(struct rk_lcdc_driver *dev_drv, int win_id)
 		    v_DSP_LINE_FLAG_NUM(screen->mode.vsync_len + screen->mode.upper_margin +
 		    screen->mode.yres -1);
 		lcdc_msk_reg(lcdc_dev, INTR_CTRL0, mask, val);
- #ifdef CONFIG_RK_FPGA
+ #if 0
 		 mask = m_WIN0_EMPTY_INTR_EN | m_WIN1_EMPTY_INTR_EN | m_WIN2_EMPTY_INTR_EN |
 			 m_WIN3_EMPTY_INTR_EN |m_HWC_EMPTY_INTR_EN | m_POST_BUF_EMPTY_INTR_EN |
 			 m_PWM_GEN_INTR_EN;
 		 val = v_WIN0_EMPTY_INTR_EN(1) | v_WIN1_EMPTY_INTR_EN(1) | v_WIN2_EMPTY_INTR_EN(1) |
 			 v_WIN3_EMPTY_INTR_EN(1)| v_HWC_EMPTY_INTR_EN(1) | v_POST_BUF_EMPTY_INTR_EN(1) |
 			 v_PWM_GEN_INTR_EN(1);
-		 /*lcdc_msk_reg(lcdc_dev, INTR_CTRL1, mask, val);*/
+		 lcdc_msk_reg(lcdc_dev, INTR_CTRL1, mask, val);
 #endif
 		/*lcdc_cfg_done(lcdc_dev);*/
 	}
diff --git a/include/linux/rk_fb.h b/include/linux/rk_fb.h
index e13d1e8cacc8..6e349194dbcb 100755
--- a/include/linux/rk_fb.h
+++ b/include/linux/rk_fb.h
@@ -549,12 +549,12 @@ extern int rk_disp_pwr_disable(struct rk_lcdc_driver *dev_drv);
 extern bool is_prmry_rk_lcdc_registered(void);
 extern int rk_fb_prase_timing_dt(struct device_node *np,
 		struct rk_screen *screen);
-#ifdef CONFIG_RK_FPGA
-static int inline support_uboot_display(void)
+
+__weak static int inline support_uboot_display(void)
 {
 	return 0;
 }
-#endif
+
 extern int rk_disp_prase_timing_dt(struct rk_lcdc_driver *dev_drv);
 
 extern int rk_fb_dpi_open(bool open);