From: Richard Zhao <richard.zhao@linaro.org>
To: linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org,
linux-mmc@vger.kernel.org, netdev@vger.kernel.org,
linux-serial@vger.kernel.org
Cc: amit.kucheria@canonical.com, linux@arm.linux.org.uk,
kernel@pengutronix.de, eric.miao@linaro.org, ben-linux@fluff.org,
cjb@laptop.org, Richard Zhao <richard.zhao@linaro.org>,
alan@linux.intel.com
Subject: [PATCH V2 04/14] ARM: mxc: pwm: add clk_prepare/clk_unprepare
Date: Fri, 11 Nov 2011 09:10:19 +0800 [thread overview]
Message-ID: <1320973829-4388-5-git-send-email-richard.zhao@linaro.org> (raw)
In-Reply-To: <1320973829-4388-1-git-send-email-richard.zhao@linaro.org>
Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
---
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;
}
}
--
1.7.5.4
next prev parent reply other threads:[~2011-11-11 1:10 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-11 1:10 [PATCH V2 00/14] add clk_prepare/clk_unprepare to imx drivers Richard Zhao
2011-11-11 1:10 ` [PATCH V2 02/14] ARM: mxc: time: add clk_prepare/clk_unprepare Richard Zhao
[not found] ` <1320973829-4388-1-git-send-email-richard.zhao-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2011-11-11 1:10 ` [PATCH V2 01/14] clk: add helper functions clk_prepare_enable and clk_disable_unprepare Richard Zhao
2011-11-11 7:28 ` Baruch Siach
2011-11-11 8:49 ` Sascha Hauer
2011-11-11 9:05 ` Richard Zhao
2011-11-11 9:15 ` Sascha Hauer
2011-11-11 10:27 ` Russell King - ARM Linux
2011-11-11 11:56 ` Sascha Hauer
[not found] ` <20111111115644.GT16886-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2011-11-11 14:20 ` Richard Zhao
2011-11-11 1:10 ` [PATCH V2 03/14] ARM: mxc: ahci: add clk_prepare/clk_unprepare Richard Zhao
2011-11-11 1:10 ` [PATCH V2 09/14] ARM: mx31moboard: " Richard Zhao
2011-11-11 1:10 ` Richard Zhao [this message]
2011-11-11 1:10 ` [PATCH V2 05/14] ARM: mxc: epit: " Richard Zhao
2011-11-11 1:10 ` [PATCH V2 06/14] ARM: mxc: arch_reset: " Richard Zhao
2011-11-11 1:10 ` [PATCH V2 07/14] ARM: mxc: audmux-v2: " Richard Zhao
2011-11-11 1:10 ` [PATCH V2 08/14] ARM: pm-imx5: " Richard Zhao
2011-11-11 1:10 ` [PATCH V2 10/14] ARM: mxs: " Richard Zhao
2011-11-11 1:10 ` [PATCH V2 11/14] serial: imx: " Richard Zhao
2011-11-11 1:10 ` [PATCH V2 12/14] net: fec: " Richard Zhao
2011-11-11 1:10 ` [PATCH V2 13/14] i2c: imx: " Richard Zhao
2011-11-11 1:10 ` [PATCH V2 14/14] mmc: sdhci-esdhc-imx: " 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=1320973829-4388-5-git-send-email-richard.zhao@linaro.org \
--to=richard.zhao@linaro.org \
--cc=alan@linux.intel.com \
--cc=amit.kucheria@canonical.com \
--cc=ben-linux@fluff.org \
--cc=cjb@laptop.org \
--cc=eric.miao@linaro.org \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=netdev@vger.kernel.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).