projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
36d9b15
)
Revert "drm/exynos: prepare FIMD clocks"
author
Inki Dae
<inki.dae@samsung.com>
Thu, 25 Apr 2013 10:21:42 +0000
(19:21 +0900)
committer
Inki Dae
<inki.dae@samsung.com>
Mon, 29 Apr 2013 05:35:31 +0000
(14:35 +0900)
This reverts commit
b4e3a3e844a0e33cf106a1c9f27ff93340c37640
.
drivers/gpu/drm/exynos/exynos_drm_fimd.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 15e58f5abe02d4c632df752bddc11810e4034e05..4073430e22c37e139187406155064af22bbb7380 100644
(file)
--- 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_
unprepar
e(ctx->lcd_clk);
- clk_
unprepar
e(ctx->bus_clk);
+ clk_
disabl
e(ctx->lcd_clk);
+ clk_
disabl
e(ctx->bus_clk);
pm_runtime_set_suspended(dev);
pm_runtime_put_sync(dev);