From patchwork Fri Nov 11 01:10:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhao X-Patchwork-Id: 5048 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id AD80123E01 for ; Fri, 11 Nov 2011 01:11:57 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id A2653A1831F for ; Fri, 11 Nov 2011 01:11:57 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id n26so5072572faa.11 for ; Thu, 10 Nov 2011 17:11:57 -0800 (PST) Received: by 10.152.110.228 with SMTP id id4mr112108lab.19.1320973917503; Thu, 10 Nov 2011 17:11:57 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.40.7 with SMTP id t7cs30857lak; Thu, 10 Nov 2011 17:11:53 -0800 (PST) Received: by 10.68.122.169 with SMTP id lt9mr19025445pbb.114.1320973910713; Thu, 10 Nov 2011 17:11:50 -0800 (PST) Received: from VA3EHSOBE009.bigfish.com (mail-va3.bigfish.com. [216.32.180.10]) by mx.google.com with ESMTPS id w7si13242516pbb.24.2011.11.10.17.11.49 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 10 Nov 2011 17:11:50 -0800 (PST) Received-SPF: neutral (google.com: 216.32.180.10 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) client-ip=216.32.180.10; Authentication-Results: mx.google.com; spf=neutral (google.com: 216.32.180.10 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) smtp.mail=richard.zhao@linaro.org Received: from mail82-va3-R.bigfish.com (10.7.14.246) by VA3EHSOBE009.bigfish.com (10.7.40.29) with Microsoft SMTP Server id 14.1.225.22; Fri, 11 Nov 2011 01:11:24 +0000 Received: from mail82-va3 (localhost [127.0.0.1]) by mail82-va3-R.bigfish.com (Postfix) with ESMTP id 66E8D1C026F; Fri, 11 Nov 2011 01:11:46 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275dhz2dh87h2a8h668h839h62h) X-Spam-TCS-SCL: 1:0 X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-FB-DOMAIN-IP-MATCH: fail Received: from mail82-va3 (localhost.localdomain [127.0.0.1]) by mail82-va3 (MessageSwitch) id 1320973906213347_20167; Fri, 11 Nov 2011 01:11:46 +0000 (UTC) Received: from VA3EHSMHS011.bigfish.com (unknown [10.7.14.235]) by mail82-va3.bigfish.com (Postfix) with ESMTP id 28C586E0049; Fri, 11 Nov 2011 01:11:46 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by VA3EHSMHS011.bigfish.com (10.7.99.21) with Microsoft SMTP Server (TLS) id 14.1.225.22; Fri, 11 Nov 2011 01:11:23 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server id 14.1.339.2; Thu, 10 Nov 2011 19:11:47 -0600 Received: from b20223-02.ap.freescale.net (b20223-02.ap.freescale.net [10.192.242.124]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id pAB1B4bS016594; Thu, 10 Nov 2011 19:11:44 -0600 (CST) From: Richard Zhao To: , , , , CC: , , , , , , , 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> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1320973829-4388-1-git-send-email-richard.zhao@linaro.org> References: <1320973829-4388-1-git-send-email-richard.zhao@linaro.org> MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com 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