diff options
| author | Inki Dae <inki.dae@samsung.com> | 2013-04-25 14:21:42 +0400 |
|---|---|---|
| committer | Inki Dae <inki.dae@samsung.com> | 2013-04-29 09:35:31 +0400 |
| commit | baa88c8313bfdb5086220cbd962a93617ee85a91 (patch) | |
| tree | 068a8ca3bd46685bdd92e7d691bd233bd76067e6 /drivers/gpu | |
| parent | 36d9b1541cedecd59e9d8fff0bbf9b7e9dd9704e (diff) | |
| download | linux-baa88c8313bfdb5086220cbd962a93617ee85a91.tar.xz | |
Revert "drm/exynos: prepare FIMD clocks"
This reverts commit b4e3a3e844a0e33cf106a1c9f27ff93340c37640.
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_fimd.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 15e58f5abe02..4073430e22c3 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -949,16 +949,6 @@ 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; @@ -1006,8 +996,8 @@ static int fimd_remove(struct platform_device *pdev) if (ctx->suspended) goto out; - clk_unprepare(ctx->lcd_clk); - clk_unprepare(ctx->bus_clk); + clk_disable(ctx->lcd_clk); + clk_disable(ctx->bus_clk); pm_runtime_set_suspended(dev); pm_runtime_put_sync(dev); |