Skip to content

Commit

Permalink
OMAPDSS: add clk_prepare_enable and clk_disable_unprepare
Browse files Browse the repository at this point in the history
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: Rajendra 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: Tomi Valkeinen <tomi.valkeinen@ti.com>
  • Loading branch information
Rajendra Nayak authored and Tomi Valkeinen committed Jun 29, 2012
1 parent 7df913b commit f11766d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions drivers/video/omap2/dss/dsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1085,9 +1085,9 @@ static inline void dsi_enable_pll_clock(struct platform_device *dsidev,
struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

if (enable)
clk_enable(dsi->sys_clk);
clk_prepare_enable(dsi->sys_clk);
else
clk_disable(dsi->sys_clk);
clk_disable_unprepare(dsi->sys_clk);

if (enable && dsi->pll_locked) {
if (wait_for_bit_change(dsidev, DSI_PLL_STATUS, 1, 1) != 1)
Expand Down
4 changes: 2 additions & 2 deletions drivers/video/omap2/dss/hdmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -785,7 +785,7 @@ static int __exit omapdss_hdmihw_remove(struct platform_device *pdev)

static int hdmi_runtime_suspend(struct device *dev)
{
clk_disable(hdmi.sys_clk);
clk_disable_unprepare(hdmi.sys_clk);

dispc_runtime_put();

Expand All @@ -800,7 +800,7 @@ static int hdmi_runtime_resume(struct device *dev)
if (r < 0)
return r;

clk_enable(hdmi.sys_clk);
clk_prepare_enable(hdmi.sys_clk);

return 0;
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/video/omap2/dss/venc.c
Original file line number Diff line number Diff line change
Expand Up @@ -930,7 +930,7 @@ static int __exit omap_venchw_remove(struct platform_device *pdev)
static int venc_runtime_suspend(struct device *dev)
{
if (venc.tv_dac_clk)
clk_disable(venc.tv_dac_clk);
clk_disable_unprepare(venc.tv_dac_clk);

dispc_runtime_put();

Expand All @@ -946,7 +946,7 @@ static int venc_runtime_resume(struct device *dev)
return r;

if (venc.tv_dac_clk)
clk_enable(venc.tv_dac_clk);
clk_prepare_enable(venc.tv_dac_clk);

return 0;
}
Expand Down

0 comments on commit f11766d

Please sign in to comment.