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: 5017 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 ED2C623E01 for ; Thu, 10 Nov 2011 04:55:27 +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 E22F3A181DF for ; Thu, 10 Nov 2011 04:55:27 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id n26so3473983faa.11 for ; Wed, 09 Nov 2011 20:55:27 -0800 (PST) Received: by 10.152.105.83 with SMTP id gk19mr3536507lab.30.1320900927693; Wed, 09 Nov 2011 20:55:27 -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 e4cs8564lae; Wed, 9 Nov 2011 20:55:27 -0800 (PST) Received: by 10.52.37.36 with SMTP id v4mr9947099vdj.61.1320900925670; Wed, 09 Nov 2011 20:55:25 -0800 (PST) Received: from ch1outboundpool.messaging.microsoft.com (ch1ehsobe004.messaging.microsoft.com. [216.32.181.184]) by mx.google.com with ESMTPS id m15si1655176vcu.175.2011.11.09.20.55.25 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 09 Nov 2011 20:55:25 -0800 (PST) Received-SPF: neutral (google.com: 216.32.181.184 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) client-ip=216.32.181.184; Authentication-Results: mx.google.com; spf=neutral (google.com: 216.32.181.184 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) smtp.mail=richard.zhao@linaro.org 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: CC: , , , , , , , Richard Zhao 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 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; } }