From mboxrd@z Thu Jan 1 00:00:00 1970 From: Richard Zhao Subject: [PATCH V2 10/14] ARM: mxs: add clk_prepare/clk_unprepare Date: Fri, 11 Nov 2011 09:10:25 +0800 Message-ID: <1320973829-4388-11-git-send-email-richard.zhao@linaro.org> References: <1320973829-4388-1-git-send-email-richard.zhao@linaro.org> Mime-Version: 1.0 Content-Type: text/plain Cc: , , , , , , , Richard Zhao To: , , , , Return-path: Received: from mail-va3.bigfish.com ([216.32.180.10]:58634 "EHLO VA3EHSOBE009.bigfish.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932645Ab1KKBLu (ORCPT ); Thu, 10 Nov 2011 20:11:50 -0500 In-Reply-To: <1320973829-4388-1-git-send-email-richard.zhao@linaro.org> Sender: netdev-owner@vger.kernel.org List-ID: Signed-off-by: Richard Zhao --- arch/arm/mach-mxs/system.c | 2 +- arch/arm/mach-mxs/timer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-mxs/system.c b/arch/arm/mach-mxs/system.c index 20ec3bd..9760a12 100644 --- a/arch/arm/mach-mxs/system.c +++ b/arch/arm/mach-mxs/system.c @@ -66,7 +66,7 @@ static int __init mxs_arch_reset_init(void) clk = clk_get_sys("rtc", NULL); if (!IS_ERR(clk)) - clk_enable(clk); + clk_prepare_enable(clk); return 0; } diff --git a/arch/arm/mach-mxs/timer.c b/arch/arm/mach-mxs/timer.c index cace0d2..564a632 100644 --- a/arch/arm/mach-mxs/timer.c +++ b/arch/arm/mach-mxs/timer.c @@ -245,7 +245,7 @@ static int __init mxs_clocksource_init(struct clk *timer_clk) void __init mxs_timer_init(struct clk *timer_clk, int irq) { - clk_enable(timer_clk); + clk_prepare_enable(timer_clk); /* * Initialize timers to a known state -- 1.7.5.4