From patchwork Tue Nov 15 06:48:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhao X-Patchwork-Id: 5131 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 F262223E10 for ; Tue, 15 Nov 2011 06:48:47 +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 E7014A18419 for ; Tue, 15 Nov 2011 06:48:47 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id a26so111371faa.11 for ; Mon, 14 Nov 2011 22:48:47 -0800 (PST) Received: by 10.152.135.179 with SMTP id pt19mr16008704lab.47.1321339727780; Mon, 14 Nov 2011 22:48:47 -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.41.198 with SMTP id h6cs27859lal; Mon, 14 Nov 2011 22:48:47 -0800 (PST) Received: by 10.68.24.1 with SMTP id q1mr49967075pbf.29.1321339725412; Mon, 14 Nov 2011 22:48:45 -0800 (PST) Received: from TX2EHSOBE009.bigfish.com (tx2ehsobe004.messaging.microsoft.com. [65.55.88.14]) by mx.google.com with ESMTPS id y9si29663591pbi.88.2011.11.14.22.48.44 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 14 Nov 2011 22:48:45 -0800 (PST) Received-SPF: neutral (google.com: 65.55.88.14 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) client-ip=65.55.88.14; Authentication-Results: mx.google.com; spf=neutral (google.com: 65.55.88.14 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) smtp.mail=richard.zhao@linaro.org Received: from mail12-tx2-R.bigfish.com (10.9.14.253) by TX2EHSOBE009.bigfish.com (10.9.40.29) with Microsoft SMTP Server id 14.1.225.22; Tue, 15 Nov 2011 06:48:13 +0000 Received: from mail12-tx2 (localhost.localdomain [127.0.0.1]) by mail12-tx2-R.bigfish.com (Postfix) with ESMTP id 06E147C01D7; Tue, 15 Nov 2011 06:48:30 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275dhz2dh87h2a8h668h839h65h) X-Spam-TCS-SCL: 4: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 mail12-tx2 (localhost.localdomain [127.0.0.1]) by mail12-tx2 (MessageSwitch) id 1321339709519734_2291; Tue, 15 Nov 2011 06:48:29 +0000 (UTC) Received: from TX2EHSMHS021.bigfish.com (unknown [10.9.14.249]) by mail12-tx2.bigfish.com (Postfix) with ESMTP id 6BEC3D80053; Tue, 15 Nov 2011 06:48:29 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by TX2EHSMHS021.bigfish.com (10.9.99.121) with Microsoft SMTP Server (TLS) id 14.1.225.22; Tue, 15 Nov 2011 06:48:12 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server id 14.1.339.2; Tue, 15 Nov 2011 00:48:42 -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 pAF6mDVO025706; Tue, 15 Nov 2011 00:48:38 -0600 (CST) From: Richard Zhao To: , , , , CC: , , , , , , , Subject: [PATCH V4 06/14] ARM: mxc: arch_reset: add clk_prepare/clk_unprepare Date: Tue, 15 Nov 2011 14:48:01 +0800 Message-ID: <1321339689-25256-7-git-send-email-richard.zhao@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1321339689-25256-1-git-send-email-richard.zhao@linaro.org> References: <1321339689-25256-1-git-send-email-richard.zhao@linaro.org> MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com It's for migrating to generic clk framework API. 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); }