Commit f11766d1 authored by Rajendra Nayak's avatar Rajendra Nayak Committed by Tomi Valkeinen

OMAPDSS: add clk_prepare_enable and clk_disable_unprepare

In preparation of OMAP moving to Common Clk Framework(CCF) change
clk_enable() and clk_disable() calls to clk_prepare_enable() and
clk_disable_unprepare() in omapdss. This can be safely done, as omapdss
never enables or disables clocks in atomic context.
Signed-off-by: default avatarRajendra Nayak <rnayak@ti.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: <linux-fbdev@vger.kernel.org>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Mike Turquette <mturquette@linaro.org>
[tomi.valkeinen@ti.com: updated patch description]
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 7df913b3
...@@ -1085,9 +1085,9 @@ static inline void dsi_enable_pll_clock(struct platform_device *dsidev, ...@@ -1085,9 +1085,9 @@ static inline void dsi_enable_pll_clock(struct platform_device *dsidev,
struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev); struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
if (enable) if (enable)
clk_enable(dsi->sys_clk); clk_prepare_enable(dsi->sys_clk);
else else
clk_disable(dsi->sys_clk); clk_disable_unprepare(dsi->sys_clk);
if (enable && dsi->pll_locked) { if (enable && dsi->pll_locked) {
if (wait_for_bit_change(dsidev, DSI_PLL_STATUS, 1, 1) != 1) if (wait_for_bit_change(dsidev, DSI_PLL_STATUS, 1, 1) != 1)
......
...@@ -785,7 +785,7 @@ static int __exit omapdss_hdmihw_remove(struct platform_device *pdev) ...@@ -785,7 +785,7 @@ static int __exit omapdss_hdmihw_remove(struct platform_device *pdev)
static int hdmi_runtime_suspend(struct device *dev) static int hdmi_runtime_suspend(struct device *dev)
{ {
clk_disable(hdmi.sys_clk); clk_disable_unprepare(hdmi.sys_clk);
dispc_runtime_put(); dispc_runtime_put();
...@@ -800,7 +800,7 @@ static int hdmi_runtime_resume(struct device *dev) ...@@ -800,7 +800,7 @@ static int hdmi_runtime_resume(struct device *dev)
if (r < 0) if (r < 0)
return r; return r;
clk_enable(hdmi.sys_clk); clk_prepare_enable(hdmi.sys_clk);
return 0; return 0;
} }
......
...@@ -930,7 +930,7 @@ static int __exit omap_venchw_remove(struct platform_device *pdev) ...@@ -930,7 +930,7 @@ static int __exit omap_venchw_remove(struct platform_device *pdev)
static int venc_runtime_suspend(struct device *dev) static int venc_runtime_suspend(struct device *dev)
{ {
if (venc.tv_dac_clk) if (venc.tv_dac_clk)
clk_disable(venc.tv_dac_clk); clk_disable_unprepare(venc.tv_dac_clk);
dispc_runtime_put(); dispc_runtime_put();
...@@ -946,7 +946,7 @@ static int venc_runtime_resume(struct device *dev) ...@@ -946,7 +946,7 @@ static int venc_runtime_resume(struct device *dev)
return r; return r;
if (venc.tv_dac_clk) if (venc.tv_dac_clk)
clk_enable(venc.tv_dac_clk); clk_prepare_enable(venc.tv_dac_clk);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment