OMAPDSS: Adapt DSS driver for skipping initialization during bootup

[android-sdk/kernel-video.git] / drivers / video / fbdev / omap2 / dss / dss.c

diff --git a/drivers/video/fbdev/omap2/dss/dss.c b/drivers/video/fbdev/omap2/dss/dss.c
index 11626611efa89cf0afb5d621e46342ca8dae2607..46e852839f4305ed22be2d789bdc2992a45bc799 100644 (file)
--- a/drivers/video/fbdev/omap2/dss/dss.c
+++ b/drivers/video/fbdev/omap2/dss/dss.c
@@ -1074,12 +1074,15 @@ static int __init omap_dsshw_probe(struct platform_device *pdev)
        if (r)
                goto err_setup_clocks;
 
-       pm_runtime_enable(&pdev->dev);
-       pm_runtime_irq_safe(&pdev->dev);
+       if (!omapdss_skipinit()) {
 
-       r = dss_runtime_get();
-       if (r)
-               goto err_runtime_get;
+               pm_runtime_enable(&pdev->dev);
+               pm_runtime_irq_safe(&pdev->dev);
+
+               r = dss_runtime_get();
+               if (r)
+                       goto err_runtime_get;
+       }
 
        dss.dss_clk_rate = clk_get_rate(dss.dss_clk);