leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/fsl-dcu: use clk helpers

Browse Source 
Use clk_prepare_enable and clk_disable_unprepare helpers. This also
fixes a sequence issue in the enable path which lead to a warning
on resume.

Signed-off-by: Stefan Agner <stefan@agner.ch>
This commit is contained in:
Stefan Agner 2016-02-11 16:56:30 -08:00
parent 1277f80271
commit ff09b41f03
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
View File

@ -232,8 +232,7 @@ static int fsl_dcu_drm_pm_suspend(struct device *dev)
drm_kms_helper_poll_disable(fsl_dev->drm); drm_kms_helper_poll_disable(fsl_dev->drm);
regcache_cache_only(fsl_dev->regmap, true); regcache_cache_only(fsl_dev->regmap, true);
regcache_mark_dirty(fsl_dev->regmap); regcache_mark_dirty(fsl_dev->regmap);
clk_disable(fsl_dev->clk); clk_disable_unprepare(fsl_dev->clk);
clk_unprepare(fsl_dev->clk);
return 0; return 0;
} }
@ -246,15 +245,9 @@ static int fsl_dcu_drm_pm_resume(struct device *dev)
if (!fsl_dev) if (!fsl_dev)
return 0; return 0;
ret = clk_enable(fsl_dev->clk); ret = clk_prepare_enable(fsl_dev->clk);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "failed to enable dcu clk\n"); dev_err(dev, "failed to enable dcu clk\n");
clk_unprepare(fsl_dev->clk);
return ret;
}
ret = clk_prepare(fsl_dev->clk);
if (ret < 0) {
dev_err(dev, "failed to prepare dcu clk\n");
return ret; return ret;
} }