From patchwork Thu Nov 10 04:54:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhao X-Patchwork-Id: 5013 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 B526423E01 for ; Thu, 10 Nov 2011 04:54:55 +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 AA741A181F0 for ; Thu, 10 Nov 2011 04:54:55 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id n26so3473983faa.11 for ; Wed, 09 Nov 2011 20:54:55 -0800 (PST) Received: by 10.152.105.83 with SMTP id gk19mr3535685lab.30.1320900895456; Wed, 09 Nov 2011 20:54:55 -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 e4cs8551lae; Wed, 9 Nov 2011 20:54:55 -0800 (PST) Received: by 10.68.6.229 with SMTP id e5mr11135389pba.21.1320900892933; Wed, 09 Nov 2011 20:54:52 -0800 (PST) Received: from TX2EHSOBE001.bigfish.com (tx2ehsobe001.messaging.microsoft.com. [65.55.88.11]) by mx.google.com with ESMTPS id g3si9390610pbv.76.2011.11.09.20.54.52 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 09 Nov 2011 20:54:52 -0800 (PST) Received-SPF: neutral (google.com: 65.55.88.11 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) client-ip=65.55.88.11; Authentication-Results: mx.google.com; spf=neutral (google.com: 65.55.88.11 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) smtp.mail=richard.zhao@linaro.org Received: from mail27-tx2-R.bigfish.com (10.9.14.242) by TX2EHSOBE001.bigfish.com (10.9.40.21) with Microsoft SMTP Server id 14.1.225.22; Thu, 10 Nov 2011 04:54:27 +0000 Received: from mail27-tx2 (localhost.localdomain [127.0.0.1]) by mail27-tx2-R.bigfish.com (Postfix) with ESMTP id 886B1D88371; Thu, 10 Nov 2011 04:54:40 +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); IPVD:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-FB-DOMAIN-IP-MATCH: fail Received: from mail27-tx2 (localhost.localdomain [127.0.0.1]) by mail27-tx2 (MessageSwitch) id 1320900880256553_2899; Thu, 10 Nov 2011 04:54:40 +0000 (UTC) Received: from TX2EHSMHS040.bigfish.com (unknown [10.9.14.249]) by mail27-tx2.bigfish.com (Postfix) with ESMTP id 36FF994804E; Thu, 10 Nov 2011 04:54:40 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by TX2EHSMHS040.bigfish.com (10.9.99.140) with Microsoft SMTP Server (TLS) id 14.1.225.22; Thu, 10 Nov 2011 04:54:26 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server id 14.1.339.2; Wed, 9 Nov 2011 22:54:50 -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 pAA4sZAg016053; Wed, 9 Nov 2011 22:54:47 -0600 (CST) From: Richard Zhao To: CC: , , , , , , , Richard Zhao Subject: [PATCH 5/9] ARM: mxc: arch_reset: convert to clk_prepare/clk_unprepare Date: Thu, 10 Nov 2011 12:54:10 +0800 Message-ID: <1320900854-13031-5-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/plat-mxc/system.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/arm/plat-mxc/system.c b/arch/arm/plat-mxc/system.c index 9dad8dc..afbe038 100644 --- a/arch/arm/plat-mxc/system.c +++ b/arch/arm/plat-mxc/system.c @@ -53,8 +53,10 @@ void arch_reset(char mode, const char *cmd) struct clk *clk; clk = clk_get_sys("imx2-wdt.0", NULL); - if (!IS_ERR(clk)) + if (!IS_ERR(clk)) { + clk_prepare(clk); clk_enable(clk); + } wcr_enable = (1 << 2); }