drm/exynos: prepare FIMD clocks

While migrating to common clock framework (CCF), I found that the FIMD clocks
were pulled down by the CCF.
If CCF finds any clock(s) which has NOT been claimed by any of the
drivers, then such clock(s) are PULLed low by CCF.

Calling clk_prepare() for FIMD clocks fixes the issue.

This patch also replaces clk_disable() with clk_unprepare() during exit, since
clk_prepare() is called in fimd_probe().

Signed-off-by: Vikas Sajjan <vikas.sajjan@linaro.org>
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 4073430e22c37e139187406155064af22bbb7380..15e58f5abe02d4c632df752bddc11810e4034e05 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -949,6 +949,16 @@ static int fimd_probe(struct platform_device *pdev)
                return ret;
        }
 
+       ret = clk_prepare(ctx->bus_clk);
+       if (ret < 0)
+               return ret;
+
+       ret = clk_prepare(ctx->lcd_clk);
+       if  (ret < 0) {
+               clk_unprepare(ctx->bus_clk);
+               return ret;
+       }
+
        ctx->vidcon0 = pdata->vidcon0;
        ctx->vidcon1 = pdata->vidcon1;
        ctx->default_win = pdata->default_win;
@@ -996,8 +1006,8 @@ static int fimd_remove(struct platform_device *pdev)
        if (ctx->suspended)
                goto out;
 
-       clk_disable(ctx->lcd_clk);
-       clk_disable(ctx->bus_clk);
+       clk_unprepare(ctx->lcd_clk);
+       clk_unprepare(ctx->bus_clk);
 
        pm_runtime_set_suspended(dev);
        pm_runtime_put_sync(dev);