Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit deccd24f authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen
Browse files

fbdev: shmobile-lcdcfb: Convert to clk_prepare/unprepare 



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: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent d00affb1

drivers/video/sh_mobile_lcdcfb.c

+2 −2
Original line number Diff line number Diff line
@@ -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 (priv->dot_clk)

			clk_enable(priv->dot_clk);

			clk_prepare_enable(priv->dot_clk);

		pm_runtime_get_sync(priv->dev);

		if (priv->meram_dev && priv->meram_dev->pdev)

			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(priv->dev);

		if (priv->dot_clk)

			clk_disable(priv->dot_clk);

			clk_disable_unprepare(priv->dot_clk);

	}

}