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

fbdev: shmobile-lcdcfb: Convert to clk_prepare/unprepare

Browse Source 
Turn clk_enable() and clk_disable() calls into clk_prepare_enable() and
clk_disable_unprepare() to get ready for the migration to the common
clock framework.

Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-fbdev@vger.kernel.org
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Laurent Pinchart 2013-10-28 23:49:29 +01:00 committed by Tomi Valkeinen
parent d00affb1c6
commit deccd24f90
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/video/sh_mobile_lcdcfb.c
View File

@ -344,7 +344,7 @@ static void sh_mobile_lcdc_clk_on(struct sh_mobile_lcdc_priv *priv)
{ {
if (atomic_inc_and_test(&priv->hw_usecnt)) { if (atomic_inc_and_test(&priv->hw_usecnt)) {
if (priv->dot_clk) if (priv->dot_clk)
clk_enable(priv->dot_clk); clk_prepare_enable(priv->dot_clk);
pm_runtime_get_sync(priv->dev); pm_runtime_get_sync(priv->dev);
if (priv->meram_dev && priv->meram_dev->pdev) if (priv->meram_dev && priv->meram_dev->pdev)
pm_runtime_get_sync(&priv->meram_dev->pdev->dev); pm_runtime_get_sync(&priv->meram_dev->pdev->dev);
@ -358,7 +358,7 @@ static void sh_mobile_lcdc_clk_off(struct sh_mobile_lcdc_priv *priv)
pm_runtime_put_sync(&priv->meram_dev->pdev->dev); pm_runtime_put_sync(&priv->meram_dev->pdev->dev);
pm_runtime_put(priv->dev); pm_runtime_put(priv->dev);
if (priv->dot_clk) if (priv->dot_clk)
clk_disable(priv->dot_clk); clk_disable_unprepare(priv->dot_clk);
} }
} }