From: yxj <yxj@rock-chips.com>
Date: Wed, 16 Apr 2014 06:15:31 +0000 (+0800)
Subject: rk32 edp: support uboot logo display
X-Git-Tag: firefly_0821_release~5544
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3d0af0a1ee9e260c650c7720614fca19b25cf021;p=firefly-linux-kernel-4.4.55.git

rk32 edp: support uboot logo display
---

diff --git a/drivers/video/rockchip/transmitter/rk32_dp.c b/drivers/video/rockchip/transmitter/rk32_dp.c
index 1ad732065a65..8de29482f241 100644
--- a/drivers/video/rockchip/transmitter/rk32_dp.c
+++ b/drivers/video/rockchip/transmitter/rk32_dp.c
@@ -1341,7 +1341,8 @@ static int rk32_edp_probe(struct platform_device *pdev)
 	clk_prepare(edp->clk_edp);
 	clk_prepare(edp->clk_24m);
 	rk32_edp_clk_enable(edp);
-	rk32_edp_pre_init();
+	if (!support_uboot_display())
+		rk32_edp_pre_init();
 	edp->irq = platform_get_irq(pdev, 0);
 	if (edp->irq < 0) {
 		dev_err(&pdev->dev, "cannot find IRQ\n");
@@ -1354,7 +1355,8 @@ static int rk32_edp_probe(struct platform_device *pdev)
 		return ret;
 	}
 	disable_irq_nosync(edp->irq);
-	rk32_edp_clk_disable(edp);
+	if (!support_uboot_display())
+		rk32_edp_clk_disable(edp);
 	rk32_edp = edp;
 	rk_fb_trsm_ops_register(&trsm_edp_ops, SCREEN_EDP);
 #if defined(CONFIG_DEBUG_FS)