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

Commit 1c09eb3e authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Daniel Lezcano
Browse files

clocksource: sh_tmu: Add clk_prepare/unprepare support 



Prepare the clock at probe time, as there is no other appropriate place
in the driver where we're allowed to sleep.

Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 394a4486

drivers/clocksource/sh_tmu.c

+8 −1
Original line number Original line Diff line number Diff line
@@ -472,6 +472,11 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev) 
		ret = PTR_ERR(p->clk);

		ret = PTR_ERR(p->clk);

		goto err1;

		goto err1;

	}

	}



	ret = clk_prepare(p->clk);

	if (ret < 0)

		goto err2;



	p->cs_enabled = false;

	p->cs_enabled = false;

	p->enable_count = 0;

	p->enable_count = 0;
@@ -479,10 +484,12 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev) 
			      cfg->clockevent_rating,

			      cfg->clockevent_rating,

			      cfg->clocksource_rating);

			      cfg->clocksource_rating);

	if (ret < 0)

	if (ret < 0)

		goto err2;

		goto err3;





	return 0;

	return 0;





 err3:

	clk_unprepare(p->clk);

 err2:

 err2:

	clk_put(p->clk);

	clk_put(p->clk);

 err1:

 err1: