rk32 edp: support uboot logo display
authoryxj <yxj@rock-chips.com>
Wed, 16 Apr 2014 06:15:31 +0000 (14:15 +0800)
committeryxj <yxj@rock-chips.com>
Wed, 16 Apr 2014 06:16:14 +0000 (14:16 +0800)
drivers/video/rockchip/transmitter/rk32_dp.c

index 1ad732065a65484d61db1074a9d16f500d18fe79..8de29482f2411a4acdc09a32056597f44cfb8a7e 100644 (file)
@@ -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)