From: richard.zhao@linaro.org (Richard Zhao)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/9] ARM: mxc: pwm: convert to clk_prepare/clk_unprepare
Date: Thu, 10 Nov 2011 12:54:08 +0800 [thread overview]
Message-ID: <1320900854-13031-3-git-send-email-richard.zhao@linaro.org> (raw)
In-Reply-To: <1320900854-13031-1-git-send-email-richard.zhao@linaro.org>
Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
---
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;
}
}
--
1.7.5.4
next prev parent reply other threads:[~2011-11-10 4:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-10 4:54 [PATCH 1/9] ARM: mxc: time: convert to clk_prepare/clk_unprepare Richard Zhao
2011-11-10 4:54 ` [PATCH 2/9] ARM: mxc: ahci: " Richard Zhao
2011-11-10 4:54 ` Richard Zhao [this message]
2011-11-10 4:54 ` [PATCH 4/9] ARM: mxc: epit: " Richard Zhao
2011-11-10 4:54 ` [PATCH 5/9] ARM: mxc: arch_reset: " Richard Zhao
2011-11-10 4:54 ` [PATCH 6/9] ARM: mxc: audmux-v2: " Richard Zhao
2011-11-10 4:54 ` [PATCH 7/9] ARM: pm-imx5: " Richard Zhao
2011-11-10 4:54 ` [PATCH 8/9] ARM: mx31moboard: " Richard Zhao
2011-11-10 4:54 ` [PATCH 9/9] ARM: mxs: " Richard Zhao
2011-11-10 8:03 ` [PATCH 1/9] ARM: mxc: time: " Sascha Hauer
2011-11-10 8:18 ` Richard Zhao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320900854-13031-3-git-send-email-richard.zhao@linaro.org \
--to=richard.zhao@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).