From patchwork Fri Nov 11 10:50:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhao X-Patchwork-Id: 5073 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 E1C7D23E0F for ; Fri, 11 Nov 2011 10:51:38 +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 D434CA183EA for ; Fri, 11 Nov 2011 10:51:38 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id n26so5533536faa.11 for ; Fri, 11 Nov 2011 02:51:38 -0800 (PST) Received: by 10.152.134.116 with SMTP id pj20mr6524424lab.5.1321008698698; Fri, 11 Nov 2011 02:51:38 -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 t7cs43148lak; Fri, 11 Nov 2011 02:51:38 -0800 (PST) Received: by 10.68.35.103 with SMTP id g7mr21793862pbj.53.1321008696110; Fri, 11 Nov 2011 02:51:36 -0800 (PST) Received: from VA3EHSOBE004.bigfish.com (va3ehsobe004.messaging.microsoft.com. [216.32.180.14]) by mx.google.com with ESMTPS id h3si2448799pbm.144.2011.11.11.02.51.35 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 11 Nov 2011 02:51:36 -0800 (PST) Received-SPF: neutral (google.com: 216.32.180.14 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) client-ip=216.32.180.14; Authentication-Results: mx.google.com; spf=neutral (google.com: 216.32.180.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 mail62-va3-R.bigfish.com (10.7.14.240) by VA3EHSOBE004.bigfish.com (10.7.40.24) with Microsoft SMTP Server id 14.1.225.22; Fri, 11 Nov 2011 10:51:08 +0000 Received: from mail62-va3 (localhost [127.0.0.1]) by mail62-va3-R.bigfish.com (Postfix) with ESMTP id E1BA4500362; Fri, 11 Nov 2011 10:53:17 +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 mail62-va3 (localhost.localdomain [127.0.0.1]) by mail62-va3 (MessageSwitch) id 1321008796150231_14919; Fri, 11 Nov 2011 10:53:16 +0000 (UTC) Received: from VA3EHSMHS010.bigfish.com (unknown [10.7.14.252]) by mail62-va3.bigfish.com (Postfix) with ESMTP id 935F44200A3; Fri, 11 Nov 2011 10:52:47 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by VA3EHSMHS010.bigfish.com (10.7.99.20) with Microsoft SMTP Server (TLS) id 14.1.225.22; Fri, 11 Nov 2011 10:50:34 +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; Fri, 11 Nov 2011 04:50:59 -0600 Received: from b20223-02.ap.freescale.net (b20223-02-010192242124.ap.freescale.net [10.192.242.124]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id pABAoecO000610; Fri, 11 Nov 2011 04:50:56 -0600 (CST) From: Richard Zhao To: , , , , CC: , , , , , , , Richard Zhao Subject: [PATCH V3 04/14] ARM: mxc: pwm: add clk_prepare/clk_unprepare Date: Fri, 11 Nov 2011 18:50:27 +0800 Message-ID: <1321008637-19999-5-git-send-email-richard.zhao@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1321008637-19999-1-git-send-email-richard.zhao@linaro.org> References: <1321008637-19999-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 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/plat-mxc/pwm.c b/arch/arm/plat-mxc/pwm.c index 42d74ea..68c7199b 100644 --- a/arch/arm/plat-mxc/pwm.c +++ b/arch/arm/plat-mxc/pwm.c @@ -118,7 +118,7 @@ int pwm_enable(struct pwm_device *pwm) int rc = 0; if (!pwm->clk_enabled) { - rc = clk_enable(pwm->clk); + rc = clk_prepare_enable(pwm->clk); if (!rc) pwm->clk_enabled = 1; } @@ -131,7 +131,7 @@ void pwm_disable(struct pwm_device *pwm) writel(0, pwm->mmio_base + MX3_PWMCR); if (pwm->clk_enabled) { - clk_disable(pwm->clk); + clk_disable_unprepare(pwm->clk); pwm->clk_enabled = 0; } }