Skip to content

Commit

Permalink
drm/exynos: prepare FIMD clocks
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Vikas Sajjan authored and Inki Dae committed Apr 20, 2013
1 parent dd4d34f commit b4e3a3e
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions drivers/gpu/drm/exynos/exynos_drm_fimd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit b4e3a3e

Please sign in to comment.