From patchwork Fri Nov 11 01:10:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhao X-Patchwork-Id: 5045 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 9C08023E01 for ; Fri, 11 Nov 2011 01:11:39 +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 90E1FA18304 for ; Fri, 11 Nov 2011 01:11:39 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id n26so5072572faa.11 for ; Thu, 10 Nov 2011 17:11:39 -0800 (PST) Received: by 10.152.135.179 with SMTP id pt19mr5660483lab.47.1320973899436; Thu, 10 Nov 2011 17:11:39 -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 t7cs30851lak; Thu, 10 Nov 2011 17:11:39 -0800 (PST) Received: by 10.68.16.165 with SMTP id h5mr18984632pbd.112.1320973896787; Thu, 10 Nov 2011 17:11:36 -0800 (PST) Received: from VA3EHSOBE008.bigfish.com (mail-va3.bigfish.com. [216.32.180.10]) by mx.google.com with ESMTPS id a4si13224366pbc.67.2011.11.10.17.11.36 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 10 Nov 2011 17:11:36 -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 mail107-va3-R.bigfish.com (10.7.14.241) by VA3EHSOBE008.bigfish.com (10.7.40.28) with Microsoft SMTP Server id 14.1.225.22; Fri, 11 Nov 2011 01:11:10 +0000 Received: from mail107-va3 (localhost [127.0.0.1]) by mail107-va3-R.bigfish.com (Postfix) with ESMTP id EC0D92003D2; Fri, 11 Nov 2011 01:10:19 +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 mail107-va3 (localhost.localdomain [127.0.0.1]) by mail107-va3 (MessageSwitch) id 1320973819619989_26252; Fri, 11 Nov 2011 01:10:19 +0000 (UTC) Received: from VA3EHSMHS011.bigfish.com (unknown [10.7.14.235]) by mail107-va3.bigfish.com (Postfix) with ESMTP id 8DC6048004A; Fri, 11 Nov 2011 01:10:19 +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:08 +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:32 -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 pAB1B4bO016594; Thu, 10 Nov 2011 19:11:29 -0600 (CST) From: Richard Zhao To: , , , , CC: , , , , , , , Richard Zhao Subject: [PATCH V2 06/14] ARM: mxc: arch_reset: add clk_prepare/clk_unprepare Date: Fri, 11 Nov 2011 09:10:21 +0800 Message-ID: <1320973829-4388-7-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/plat-mxc/system.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/plat-mxc/system.c b/arch/arm/plat-mxc/system.c index 9dad8dc..a667adc 100644 --- a/arch/arm/plat-mxc/system.c +++ b/arch/arm/plat-mxc/system.c @@ -54,7 +54,7 @@ void arch_reset(char mode, const char *cmd) clk = clk_get_sys("imx2-wdt.0", NULL); if (!IS_ERR(clk)) - clk_enable(clk); + clk_prepare_enable(clk); wcr_enable = (1 << 2); }