evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/tegra: hdmi - Clean up clock usage

Browse source 
Clocks are never enabled or disabled in atomic context, so we can use
the clk_prepare_enable() and clk_disable_unprepare() helpers instead.

Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
Thierry Reding 2014-04-16 10:43:41 +02:00
parent 8868568718
commit d06e7f8f66
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/gpu/drm/tegra/hdmi.c
View file

@ -727,7 +727,7 @@ static int tegra_output_hdmi_enable(struct tegra_output *output)
if (err < 0) if (err < 0)
return err; return err;
err = clk_enable(hdmi->clk); err = clk_prepare_enable(hdmi->clk);
if (err < 0) { if (err < 0) {
dev_err(hdmi->dev, "failed to enable clock: %d\n", err); dev_err(hdmi->dev, "failed to enable clock: %d\n", err);
return err; return err;
@ -944,8 +944,8 @@ static int tegra_output_hdmi_disable(struct tegra_output *output)
tegra_dc_writel(dc, GENERAL_ACT_REQ, DC_CMD_STATE_CONTROL); tegra_dc_writel(dc, GENERAL_ACT_REQ, DC_CMD_STATE_CONTROL);
} }
clk_disable_unprepare(hdmi->clk);
reset_control_assert(hdmi->rst); reset_control_assert(hdmi->rst);
clk_disable(hdmi->clk);
regulator_disable(hdmi->vdd); regulator_disable(hdmi->vdd);
regulator_disable(hdmi->pll); regulator_disable(hdmi->pll);
@ -1015,7 +1015,7 @@ static int tegra_hdmi_show_regs(struct seq_file *s, void *data)
struct tegra_hdmi *hdmi = node->info_ent->data; struct tegra_hdmi *hdmi = node->info_ent->data;
int err; int err;
err = clk_enable(hdmi->clk); err = clk_prepare_enable(hdmi->clk);
if (err) if (err)
return err; return err;
@ -1184,7 +1184,7 @@ static int tegra_hdmi_show_regs(struct seq_file *s, void *data)
#undef DUMP_REG #undef DUMP_REG
clk_disable(hdmi->clk); clk_disable_unprepare(hdmi->clk);
return 0; return 0;
} }
@ -1379,18 +1379,10 @@ static int tegra_hdmi_probe(struct platform_device *pdev)
return PTR_ERR(hdmi->rst); return PTR_ERR(hdmi->rst);
} }
err = clk_prepare(hdmi->clk);
if (err < 0)
return err;
hdmi->clk_parent = devm_clk_get(&pdev->dev, "parent"); hdmi->clk_parent = devm_clk_get(&pdev->dev, "parent");
if (IS_ERR(hdmi->clk_parent)) if (IS_ERR(hdmi->clk_parent))
return PTR_ERR(hdmi->clk_parent); return PTR_ERR(hdmi->clk_parent);
err = clk_prepare(hdmi->clk_parent);
if (err < 0)
return err;
err = clk_set_parent(hdmi->clk, hdmi->clk_parent); err = clk_set_parent(hdmi->clk, hdmi->clk_parent);
if (err < 0) { if (err < 0) {
dev_err(&pdev->dev, "failed to setup clocks: %d\n", err); dev_err(&pdev->dev, "failed to setup clocks: %d\n", err);
@ -1466,8 +1458,8 @@ static int tegra_hdmi_remove(struct platform_device *pdev)
return err; return err;
} }
clk_unprepare(hdmi->clk_parent); clk_disable_unprepare(hdmi->clk_parent);
clk_unprepare(hdmi->clk); clk_disable_unprepare(hdmi->clk);
return 0; return 0;
} }