Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 12:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

OMAPDSS: add clk_prepare_enable and clk_disable_unprepare

Browse Source 
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>
This commit is contained in:
Rajendra Nayak 2012-06-27 14:21:26 +05:30 committed by Tomi Valkeinen
parent 7df913b352
commit f11766d1c2
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/video/omap2/dss/dsi.c
View File

@ -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)

4
drivers/video/omap2/dss/hdmi.c
View File

@ -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();
@ -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;
}

4
drivers/video/omap2/dss/venc.c
View File

@ -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();
@ -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;
}