linux-serial.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
	<richard.zhao-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Subject: [PATCH V3 11/14] serial: imx: add clk_prepare/clk_unprepare
Date: Fri, 11 Nov 2011 18:50:34 +0800	[thread overview]
Message-ID: <1321008637-19999-12-git-send-email-richard.zhao@linaro.org> (raw)
In-Reply-To: <1321008637-19999-1-git-send-email-richard.zhao-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>

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

  parent reply	other threads:[~2011-11-11 10:50 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-11 10:50 [PATCH V3 00/14] add clk_prepare/clk_unprepare to imx drivers Richard Zhao
2011-11-11 10:50 ` [PATCH V3 01/14] clk: add helper functions clk_prepare_enable and clk_disable_unprepare Richard Zhao
2011-11-11 10:50 ` [PATCH V3 06/14] ARM: mxc: arch_reset: add clk_prepare/clk_unprepare Richard Zhao
2011-11-11 10:50 ` [PATCH V3 07/14] ARM: mxc: audmux-v2: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 08/14] ARM: pm-imx5: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 10/14] ARM: mxs: " Richard Zhao
     [not found]   ` <1321008637-19999-11-git-send-email-richard.zhao-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2011-12-19 22:21     ` Marek Vasut
2011-12-20  0:56       ` Richard Zhao
2011-12-20  2:15   ` Shawn Guo
2011-11-11 10:50 ` [PATCH V3 12/14] net: fec: " Richard Zhao
     [not found] ` <1321008637-19999-1-git-send-email-richard.zhao-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2011-11-11 10:50   ` [PATCH V3 02/14] ARM: mxc: time: " Richard Zhao
2011-11-11 10:50   ` [PATCH V3 03/14] ARM: mxc: ahci: " Richard Zhao
2011-11-11 10:50   ` [PATCH V3 04/14] ARM: mxc: pwm: " Richard Zhao
2011-11-11 10:50   ` [PATCH V3 05/14] ARM: mxc: epit: " Richard Zhao
2011-11-11 10:50   ` [PATCH V3 09/14] ARM: mx31moboard: " Richard Zhao
2011-11-11 10:50   ` Richard Zhao [this message]
2011-11-11 10:50   ` [PATCH V3 13/14] i2c: imx: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 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=1321008637-19999-12-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).