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: <linux@arm.linux.org.uk>, <amit.kucheria@canonical.com>,
<kernel@pengutronix.de>, <ben-linux@fluff.org>, <cjb@laptop.org>,
<alan@linux.intel.com>, <eric.miao@linaro.org>,
<richard.zhao@linaro.org>
Subject: [PATCH V4 11/14] serial: imx: add clk_prepare/clk_unprepare
Date: Tue, 15 Nov 2011 14:48:06 +0800 [thread overview]
Message-ID: <1321339689-25256-12-git-send-email-richard.zhao@linaro.org> (raw)
In-Reply-To: <1321339689-25256-1-git-send-email-richard.zhao@linaro.org>
It's for migrating to generic clk framework API.
Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
---
drivers/tty/serial/imx.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 163fc90..8f3709f 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1390,7 +1390,7 @@ static int serial_imx_probe(struct platform_device *pdev)
ret = PTR_ERR(sport->clk);
goto unmap;
}
- clk_enable(sport->clk);
+ clk_prepare_enable(sport->clk);
sport->port.uartclk = clk_get_rate(sport->clk);
@@ -1413,8 +1413,8 @@ deinit:
if (pdata && pdata->exit)
pdata->exit(pdev);
clkput:
+ clk_disable_unprepare(sport->clk);
clk_put(sport->clk);
- clk_disable(sport->clk);
unmap:
iounmap(sport->port.membase);
free:
@@ -1434,11 +1434,10 @@ static int serial_imx_remove(struct platform_device *pdev)
if (sport) {
uart_remove_one_port(&imx_reg, &sport->port);
+ clk_disable_unprepare(sport->clk);
clk_put(sport->clk);
}
- clk_disable(sport->clk);
-
if (pdata && pdata->exit)
pdata->exit(pdev);
--
1.7.5.4
next prev parent reply other threads:[~2011-11-15 6:48 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
2011-11-15 6:48 ` [PATCH V4 05/14] ARM: mxc: epit: " Richard Zhao
[not found] ` <1321339689-25256-1-git-send-email-richard.zhao-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2011-11-15 6:47 ` [PATCH V4 04/14] ARM: mxc: pwm: " Richard Zhao
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 08/14] ARM: pm-imx5: add clk_prepare/clk_unprepare Richard Zhao
2011-11-15 6:48 ` [PATCH V4 09/14] ARM: mx31moboard: " Richard Zhao
2011-11-15 6:48 ` Richard Zhao [this message]
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-12-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).