From: sboyd@codeaurora.org (Stephen Boyd)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 01/12] msm_serial: Convert to clk_prepare/unprepare
Date: Tue, 4 Jun 2013 12:25:27 -0700 [thread overview]
Message-ID: <1370373938-32417-2-git-send-email-sboyd@codeaurora.org> (raw)
In-Reply-To: <1370373938-32417-1-git-send-email-sboyd@codeaurora.org>
Add calls to clk_prepare and unprepare so that MSM can migrate to
the common clock framework.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
drivers/tty/serial/msm_serial.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index b11e997..0149603 100644
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -408,9 +408,9 @@ static void msm_init_clock(struct uart_port *port)
{
struct msm_port *msm_port = UART_TO_MSM(port);
- clk_enable(msm_port->clk);
+ clk_prepare_enable(msm_port->clk);
if (!IS_ERR(msm_port->pclk))
- clk_enable(msm_port->pclk);
+ clk_prepare_enable(msm_port->pclk);
msm_serial_set_mnd_regs(port);
}
@@ -486,7 +486,7 @@ static void msm_shutdown(struct uart_port *port)
msm_port->imr = 0;
msm_write(port, 0, UART_IMR); /* disable interrupts */
- clk_disable(msm_port->clk);
+ clk_disable_unprepare(msm_port->clk);
free_irq(port->irq, port);
}
@@ -688,14 +688,14 @@ static void msm_power(struct uart_port *port, unsigned int state,
switch (state) {
case 0:
- clk_enable(msm_port->clk);
+ clk_prepare_enable(msm_port->clk);
if (!IS_ERR(msm_port->pclk))
- clk_enable(msm_port->pclk);
+ clk_prepare_enable(msm_port->pclk);
break;
case 3:
- clk_disable(msm_port->clk);
+ clk_disable_unprepare(msm_port->clk);
if (!IS_ERR(msm_port->pclk))
- clk_disable(msm_port->pclk);
+ clk_disable_unprepare(msm_port->pclk);
break;
default:
printk(KERN_ERR "msm_serial: Unknown PM state %d\n", state);
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
next prev parent reply other threads:[~2013-06-04 19:25 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-04 19:25 [PATCH 00/12] Convert MSM to common clock framework Stephen Boyd
2013-06-04 19:25 ` Stephen Boyd [this message]
2013-06-04 19:25 ` [PATCH 02/12] msm_serial: Use devm_clk_get() and properly return errors Stephen Boyd
2013-06-04 19:25 ` [PATCH 03/12] usb: otg: msm: Convert to clk_prepare/unprepare Stephen Boyd
2013-06-04 20:21 ` Felipe Balbi
2013-06-04 19:25 ` [PATCH 04/12] msm_sdcc: " Stephen Boyd
2013-06-04 19:25 ` [PATCH 05/12] msm: iommu: " Stephen Boyd
2013-06-04 19:25 ` [PATCH 06/12] msm: iommu: Use clk_set_rate() instead of clk_set_min_rate() Stephen Boyd
2013-06-04 19:25 ` [PATCH 07/12] ARM: msm: Remove custom clk_set_flags() API Stephen Boyd
2013-06-04 19:25 ` [PATCH 08/12] ARM: msm: Remove custom clk_set_{max,min}_rate() API Stephen Boyd
2013-06-04 19:25 ` [PATCH 09/12] ARM: msm: Remove clock-7x30.h include file Stephen Boyd
2013-06-04 19:25 ` [PATCH 10/12] ARM: msm: Prepare clk_get() users in mach-msm for clock-pcom driver Stephen Boyd
2013-06-04 19:25 ` [PATCH 11/12] ARM: msm: Make proc_comm clock control into a platform driver Stephen Boyd
2013-06-04 19:25 ` [PATCH 12/12] ARM: msm: Migrate to common clock framework Stephen Boyd
2013-06-11 22:28 ` Mike Turquette
2013-06-12 16:54 ` Stephen Boyd
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=1370373938-32417-2-git-send-email-sboyd@codeaurora.org \
--to=sboyd@codeaurora.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).