|
@@ -801,18 +801,18 @@ static int fimd_clock(struct fimd_context *ctx, bool enable)
|
|
|
if (enable) {
|
|
|
int ret;
|
|
|
|
|
|
- ret = clk_enable(ctx->bus_clk);
|
|
|
+ ret = clk_prepare_enable(ctx->bus_clk);
|
|
|
if (ret < 0)
|
|
|
return ret;
|
|
|
|
|
|
- ret = clk_enable(ctx->lcd_clk);
|
|
|
+ ret = clk_prepare_enable(ctx->lcd_clk);
|
|
|
if (ret < 0) {
|
|
|
- clk_disable(ctx->bus_clk);
|
|
|
+ clk_disable_unprepare(ctx->bus_clk);
|
|
|
return ret;
|
|
|
}
|
|
|
} else {
|
|
|
- clk_disable(ctx->lcd_clk);
|
|
|
- clk_disable(ctx->bus_clk);
|
|
|
+ clk_disable_unprepare(ctx->lcd_clk);
|
|
|
+ clk_disable_unprepare(ctx->bus_clk);
|
|
|
}
|
|
|
|
|
|
return 0;
|
|
@@ -996,9 +996,6 @@ static int fimd_remove(struct platform_device *pdev)
|
|
|
if (ctx->suspended)
|
|
|
goto out;
|
|
|
|
|
|
- clk_disable(ctx->lcd_clk);
|
|
|
- clk_disable(ctx->bus_clk);
|
|
|
-
|
|
|
pm_runtime_set_suspended(dev);
|
|
|
pm_runtime_put_sync(dev);
|
|
|
|