From patchwork Fri Nov 11 01:10:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhao X-Patchwork-Id: 5043 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 99FB623E01 for ; Fri, 11 Nov 2011 01:11:30 +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 8EFBDA18310 for ; Fri, 11 Nov 2011 01:11:30 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id n26so5072572faa.11 for ; Thu, 10 Nov 2011 17:11:30 -0800 (PST) Received: by 10.152.162.10 with SMTP id xw10mr5719611lab.12.1320973890421; Thu, 10 Nov 2011 17:11:30 -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 t7cs30841lak; Thu, 10 Nov 2011 17:11:29 -0800 (PST) Received: by 10.216.14.29 with SMTP id c29mr1848wec.13.1320973888530; Thu, 10 Nov 2011 17:11:28 -0800 (PST) Received: from AM1EHSOBE003.bigfish.com (mail-am1.bigfish.com. [213.199.180.138]) by mx.google.com with ESMTPS id h17si5634223wee.101.2011.11.10.17.11.27 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 10 Nov 2011 17:11:28 -0800 (PST) Received-SPF: neutral (google.com: 213.199.180.138 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) client-ip=213.199.180.138; Authentication-Results: mx.google.com; spf=neutral (google.com: 213.199.180.138 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) smtp.mail=richard.zhao@linaro.org Received: from mail4-am1-R.bigfish.com (10.3.201.247) by AM1EHSOBE003.bigfish.com (10.3.204.23) with Microsoft SMTP Server id 14.1.225.22; Fri, 11 Nov 2011 01:11:02 +0000 Received: from mail4-am1 (localhost [127.0.0.1]) by mail4-am1-R.bigfish.com (Postfix) with ESMTP id DF5B52E01B6; Fri, 11 Nov 2011 01:11:06 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275dhz2dh87h2a8h668h839h) 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-SS: 13, X-FB-DOMAIN-IP-MATCH: fail Received: from mail4-am1 (localhost.localdomain [127.0.0.1]) by mail4-am1 (MessageSwitch) id 1320973866692741_30620; Fri, 11 Nov 2011 01:11:06 +0000 (UTC) Received: from AM1EHSMHS007.bigfish.com (unknown [10.3.201.254]) by mail4-am1.bigfish.com (Postfix) with ESMTP id A384B20045; Fri, 11 Nov 2011 01:11:06 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by AM1EHSMHS007.bigfish.com (10.3.207.107) with Microsoft SMTP Server (TLS) id 14.1.225.22; Fri, 11 Nov 2011 01:11:01 +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; Thu, 10 Nov 2011 19:11:25 -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 pAB1B4bM016594; Thu, 10 Nov 2011 19:11:21 -0600 (CST) From: Richard Zhao To: , , , , CC: , , , , , , , Richard Zhao Subject: [PATCH V2 04/14] ARM: mxc: pwm: add clk_prepare/clk_unprepare Date: Fri, 11 Nov 2011 09:10:19 +0800 Message-ID: <1320973829-4388-5-git-send-email-richard.zhao@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1320973829-4388-1-git-send-email-richard.zhao@linaro.org> References: <1320973829-4388-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; } }