netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Richard Zhao <richard.zhao-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
To: <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>,
	<linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
	<linux-mmc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
	<netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
	<linux-serial-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Cc: <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>,
	<amit.kucheria-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>,
	<kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>,
	<ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>,
	<cjb-2X9k7bc8m7Mdnm+yROfE0A@public.gmane.org>,
	<alan-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>,
	<eric.miao-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
	<richard.zhao-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Subject: [PATCH V4 04/14] ARM: mxc: pwm: add clk_prepare/clk_unprepare
Date: Tue, 15 Nov 2011 14:47:59 +0800	[thread overview]
Message-ID: <1321339689-25256-5-git-send-email-richard.zhao@linaro.org> (raw)
In-Reply-To: <1321339689-25256-1-git-send-email-richard.zhao-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>

It's for migrating to generic clk framework API.

Signed-off-by: Richard Zhao <richard.zhao-QSEj5FYQhm4dnm+yROfE0A@public.gmane.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

  parent reply	other threads:[~2011-11-15  6:47 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-15  6:47 [PATCH V4 00/14] add clk_prepare/clk_unprepare to imx drivers Richard Zhao
2011-11-15  6:47 ` [PATCH V4 01/14] clk: add helper functions clk_prepare_enable and clk_disable_unprepare Richard Zhao
2011-11-15  6:47 ` [PATCH V4 02/14] ARM: mxc: time: add clk_prepare/clk_unprepare Richard Zhao
2011-11-15  6:47 ` [PATCH V4 03/14] ARM: mxc: ahci: " Richard Zhao
     [not found] ` <1321339689-25256-1-git-send-email-richard.zhao-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2011-11-15  6:47   ` Richard Zhao [this message]
2011-11-15  6:48   ` [PATCH V4 06/14] ARM: mxc: arch_reset: " Richard Zhao
2011-11-15  6:48   ` [PATCH V4 07/14] ARM: mxc: audmux-v2: " Richard Zhao
2011-11-15  6:48   ` [PATCH V4 10/14] ARM: mxs: " Richard Zhao
2011-11-15  6:48   ` [PATCH V4 14/14] mmc: sdhci-esdhc-imx: " Richard Zhao
2011-11-17  1:22   ` [PATCH V4 00/14] add clk_prepare/clk_unprepare to imx drivers Richard Zhao
2011-12-02 11:07     ` Richard Zhao
2011-12-02 11:40       ` Richard Zhao
2011-11-15  6:48 ` [PATCH V4 05/14] ARM: mxc: epit: add clk_prepare/clk_unprepare Richard Zhao
2011-11-15  6:48 ` [PATCH V4 08/14] ARM: pm-imx5: " Richard Zhao
2011-11-15  6:48 ` [PATCH V4 09/14] ARM: mx31moboard: " Richard Zhao
2011-11-15  6:48 ` [PATCH V4 11/14] serial: imx: " Richard Zhao
2011-11-15  6:48 ` [PATCH V4 12/14] net: fec: " Richard Zhao
2011-11-15  6:48 ` [PATCH V4 13/14] i2c: 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=1321339689-25256-5-git-send-email-richard.zhao@linaro.org \
    --to=richard.zhao-qsej5fyqhm4dnm+yrofe0a@public.gmane.org \
    --cc=alan-VuQAYsv1563Yd54FQh9/CA@public.gmane.org \
    --cc=amit.kucheria-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org \
    --cc=ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org \
    --cc=cjb-2X9k7bc8m7Mdnm+yROfE0A@public.gmane.org \
    --cc=eric.miao-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
    --cc=kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org \
    --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org \
    --cc=linux-mmc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-serial-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.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).