diff options
author | Inki Dae <inki.dae@samsung.com> | 2013-04-25 06:21:42 -0400 |
---|---|---|
committer | Inki Dae <inki.dae@samsung.com> | 2013-04-29 01:35:31 -0400 |
commit | baa88c8313bfdb5086220cbd962a93617ee85a91 (patch) | |
tree | 068a8ca3bd46685bdd92e7d691bd233bd76067e6 /drivers/gpu | |
parent | 36d9b1541cedecd59e9d8fff0bbf9b7e9dd9704e (diff) |
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) | |||
949 | return ret; | 949 | return ret; |
950 | } | 950 | } |
951 | 951 | ||
952 | ret = clk_prepare(ctx->bus_clk); | ||
953 | if (ret < 0) | ||
954 | return ret; | ||
955 | |||
956 | ret = clk_prepare(ctx->lcd_clk); | ||
957 | if (ret < 0) { | ||
958 | clk_unprepare(ctx->bus_clk); | ||
959 | return ret; | ||
960 | } | ||
961 | |||
962 | ctx->vidcon0 = pdata->vidcon0; | 952 | ctx->vidcon0 = pdata->vidcon0; |
963 | ctx->vidcon1 = pdata->vidcon1; | 953 | ctx->vidcon1 = pdata->vidcon1; |
964 | ctx->default_win = pdata->default_win; | 954 | ctx->default_win = pdata->default_win; |
@@ -1006,8 +996,8 @@ static int fimd_remove(struct platform_device *pdev) | |||
1006 | if (ctx->suspended) | 996 | if (ctx->suspended) |
1007 | goto out; | 997 | goto out; |
1008 | 998 | ||
1009 | clk_unprepare(ctx->lcd_clk); | 999 | clk_disable(ctx->lcd_clk); |
1010 | clk_unprepare(ctx->bus_clk); | 1000 | clk_disable(ctx->bus_clk); |
1011 | 1001 | ||
1012 | pm_runtime_set_suspended(dev); | 1002 | pm_runtime_set_suspended(dev); |
1013 | pm_runtime_put_sync(dev); | 1003 | pm_runtime_put_sync(dev); |