From patchwork Thu Nov 10 04:54:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhao X-Patchwork-Id: 5016 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 0994C23E01 for ; Thu, 10 Nov 2011 04:55:07 +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 F2E57A181F0 for ; Thu, 10 Nov 2011 04:55:06 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id n26so3473983faa.11 for ; Wed, 09 Nov 2011 20:55:06 -0800 (PST) Received: by 10.152.112.10 with SMTP id im10mr3536746lab.2.1320900906823; Wed, 09 Nov 2011 20:55:06 -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.3.196 with SMTP id e4cs8560lae; Wed, 9 Nov 2011 20:55:06 -0800 (PST) Received: by 10.68.7.132 with SMTP id j4mr11601104pba.11.1320900904394; Wed, 09 Nov 2011 20:55:04 -0800 (PST) Received: from VA3EHSOBE002.bigfish.com (va3ehsobe002.messaging.microsoft.com. [216.32.180.12]) by mx.google.com with ESMTPS id o3si9325908pbc.236.2011.11.09.20.55.03 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 09 Nov 2011 20:55:04 -0800 (PST) Received-SPF: neutral (google.com: 216.32.180.12 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) client-ip=216.32.180.12; Authentication-Results: mx.google.com; spf=neutral (google.com: 216.32.180.12 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) smtp.mail=richard.zhao@linaro.org Received: from mail137-va3-R.bigfish.com (10.7.14.244) by VA3EHSOBE002.bigfish.com (10.7.40.22) with Microsoft SMTP Server id 14.1.225.22; Thu, 10 Nov 2011 04:54:38 +0000 Received: from mail137-va3 (localhost [127.0.0.1]) by mail137-va3-R.bigfish.com (Postfix) with ESMTP id 6E0C6480398; Thu, 10 Nov 2011 04:54:54 +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 mail137-va3 (localhost.localdomain [127.0.0.1]) by mail137-va3 (MessageSwitch) id 1320900893867227_30711; Thu, 10 Nov 2011 04:54:53 +0000 (UTC) Received: from VA3EHSMHS024.bigfish.com (unknown [10.7.14.251]) by mail137-va3.bigfish.com (Postfix) with ESMTP id CC09A40044; Thu, 10 Nov 2011 04:54:53 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by VA3EHSMHS024.bigfish.com (10.7.99.34) with Microsoft SMTP Server (TLS) id 14.1.225.22; Thu, 10 Nov 2011 04:54:37 +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; Wed, 9 Nov 2011 22:55:01 -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 pAA4sZAk016053; Wed, 9 Nov 2011 22:54:58 -0600 (CST) From: Richard Zhao To: CC: , , , , , , , Richard Zhao Subject: [PATCH 9/9] ARM: mxs: convert to clk_prepare/clk_unprepare Date: Thu, 10 Nov 2011 12:54:14 +0800 Message-ID: <1320900854-13031-9-git-send-email-richard.zhao@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1320900854-13031-1-git-send-email-richard.zhao@linaro.org> References: <1320900854-13031-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 | 4 +++- arch/arm/mach-mxs/timer.c | 1 + 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-mxs/system.c b/arch/arm/mach-mxs/system.c index 20ec3bd..57ce7f7 100644 --- a/arch/arm/mach-mxs/system.c +++ b/arch/arm/mach-mxs/system.c @@ -65,8 +65,10 @@ static int __init mxs_arch_reset_init(void) MX28_CLKCTRL_RESET_OFFSET); clk = clk_get_sys("rtc", NULL); - if (!IS_ERR(clk)) + if (!IS_ERR(clk)) { + clk_prepare(clk); clk_enable(clk); + } return 0; } diff --git a/arch/arm/mach-mxs/timer.c b/arch/arm/mach-mxs/timer.c index cace0d2..ba87b30 100644 --- a/arch/arm/mach-mxs/timer.c +++ b/arch/arm/mach-mxs/timer.c @@ -245,6 +245,7 @@ static int __init mxs_clocksource_init(struct clk *timer_clk) void __init mxs_timer_init(struct clk *timer_clk, int irq) { + clk_prepare(timer_clk); clk_enable(timer_clk); /*