From patchwork Thu Nov 10 04:54:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhao X-Patchwork-Id: 124782 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 66435B6F68 for ; Thu, 10 Nov 2011 15:58:35 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1ROMgF-0005F6-M0; Thu, 10 Nov 2011 04:56:03 +0000 Received: from ch1ehsobe005.messaging.microsoft.com ([216.32.181.185] helo=ch1outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1ROMfd-0004z2-Ev for linux-arm-kernel@lists.infradead.org; Thu, 10 Nov 2011 04:55:26 +0000 Received: from mail65-ch1-R.bigfish.com (10.43.68.246) by CH1EHSOBE015.bigfish.com (10.43.70.65) with Microsoft SMTP Server id 14.1.225.22; Thu, 10 Nov 2011 04:55:00 +0000 Received: from mail65-ch1 (localhost.localdomain [127.0.0.1]) by mail65-ch1-R.bigfish.com (Postfix) with ESMTP id 949E51AE834E; Thu, 10 Nov 2011 04:55:13 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275dhz2dh87h2a8h668h839h) 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-SS: 0, X-FB-DOMAIN-IP-MATCH: fail Received: from mail65-ch1 (localhost.localdomain [127.0.0.1]) by mail65-ch1 (MessageSwitch) id 1320900874827401_4839; Thu, 10 Nov 2011 04:54:34 +0000 (UTC) Received: from CH1EHSMHS002.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.249]) by mail65-ch1.bigfish.com (Postfix) with ESMTP id C3DC14004E; Thu, 10 Nov 2011 04:54:34 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS002.bigfish.com (10.43.70.2) with Microsoft SMTP Server (TLS) id 14.1.225.22; Thu, 10 Nov 2011 04:54:46 +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; Wed, 9 Nov 2011 22:54:44 -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 pAA4sZAe016053; Wed, 9 Nov 2011 22:54:42 -0600 (CST) From: Richard Zhao To: Subject: [PATCH 3/9] ARM: mxc: pwm: convert to clk_prepare/clk_unprepare Date: Thu, 10 Nov 2011 12:54:08 +0800 Message-ID: <1320900854-13031-3-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 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [216.32.181.185 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: amit.kucheria@canonical.com, patches@linaro.org, eric.miao@linaro.org, richard.zhu@linaro.org, kernel@pengutronix.de, u.kleine-koenig@pengutronix.de, shawn.guo@linaro.org, Richard Zhao X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Signed-off-by: Richard Zhao --- arch/arm/plat-mxc/pwm.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/arch/arm/plat-mxc/pwm.c b/arch/arm/plat-mxc/pwm.c index 42d74ea..3371698 100644 --- a/arch/arm/plat-mxc/pwm.c +++ b/arch/arm/plat-mxc/pwm.c @@ -118,9 +118,13 @@ int pwm_enable(struct pwm_device *pwm) int rc = 0; if (!pwm->clk_enabled) { - rc = clk_enable(pwm->clk); + rc = clk_prepare(pwm->clk); if (!rc) + rc = clk_enable(pwm->clk); + if (!rc) { pwm->clk_enabled = 1; + } else + clk_unprepare(pwm->clk); } return rc; } @@ -132,6 +136,7 @@ void pwm_disable(struct pwm_device *pwm) if (pwm->clk_enabled) { clk_disable(pwm->clk); + clk_unprepare(pwm->clk); pwm->clk_enabled = 0; } }