From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomasz Figa Subject: [PATCH v4 11/14] clocksource: samsung-time: Use clk_prepare_enable Date: Thu, 04 Apr 2013 18:37:08 +0200 Message-ID: <1365093431-30621-12-git-send-email-t.figa@samsung.com> References: <1365093431-30621-1-git-send-email-t.figa@samsung.com> Return-path: In-reply-to: <1365093431-30621-1-git-send-email-t.figa@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org To: linux-arm-kernel@lists.infradead.org Cc: devicetree-discuss@lists.ozlabs.org, linux-samsung-soc@vger.kernel.org, sameo@linux.intel.com, kgene.kim@samsung.com, kyungmin.park@samsung.com, linux@simtec.co.uk, broonie@opensource.wolfsonmicro.com, kwangwoo.lee@gmail.com, jacmet@sunsite.dk, augulis.darius@gmail.com, mcuelenaere@gmail.com, linux@arm.linux.org.uk, sylvester.nawrocki@gmail.com, buserror@gmail.com, christer@weinigel.se, jekhor@gmail.com, ghcstop@gmail.com, mark.rutland@arm.com, tomasz.figa@gmail.com, heiko@sntech.de, robherring2@gmail.com, m.szyprowski@samsung.com, arnd@arndb.de, john.stultz@linaro.org, tglx@linutronix.de, Tomasz Figa List-Id: devicetree@vger.kernel.org This patch modifies the driver to use clk_prepare_enable instead of clk_enable, as required to be compliant with Common Clock Framework. Signed-off-by: Tomasz Figa Signed-off-by: Kyungmin Park --- drivers/clocksource/samsung-time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clocksource/samsung-time.c b/drivers/clocksource/samsung-time.c index e617d37..7674882 100644 --- a/drivers/clocksource/samsung-time.c +++ b/drivers/clocksource/samsung-time.c @@ -383,7 +383,7 @@ static void __init samsung_timer_resources(void) if (IS_ERR(timerclk)) panic("failed to get timers clock for timer"); - clk_enable(tin_source); + clk_prepare_enable(timerclk); timer_source.tcnt_max = (1UL << pwm->variant.bits) - 1; if (pwm->variant.bits == 16) { -- 1.8.1.5