From: richard.zhao@linaro.org (Richard Zhao)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V3 07/14] ARM: mxc: audmux-v2: add clk_prepare/clk_unprepare
Date: Fri, 11 Nov 2011 18:50:30 +0800 [thread overview]
Message-ID: <1321008637-19999-8-git-send-email-richard.zhao@linaro.org> (raw)
In-Reply-To: <1321008637-19999-1-git-send-email-richard.zhao@linaro.org>
Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
---
arch/arm/plat-mxc/audmux-v2.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/plat-mxc/audmux-v2.c b/arch/arm/plat-mxc/audmux-v2.c
index 8cced35..0e51fc3 100644
--- a/arch/arm/plat-mxc/audmux-v2.c
+++ b/arch/arm/plat-mxc/audmux-v2.c
@@ -73,13 +73,13 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
return -ENOMEM;
if (audmux_clk)
- clk_enable(audmux_clk);
+ clk_prepare_enable(audmux_clk);
ptcr = readl(audmux_base + MXC_AUDMUX_V2_PTCR(port));
pdcr = readl(audmux_base + MXC_AUDMUX_V2_PDCR(port));
if (audmux_clk)
- clk_disable(audmux_clk);
+ clk_disable_unprepare(audmux_clk);
ret = snprintf(buf, PAGE_SIZE, "PDCR: %08x\nPTCR: %08x\n",
pdcr, ptcr);
@@ -172,13 +172,13 @@ int mxc_audmux_v2_configure_port(unsigned int port, unsigned int ptcr,
return -ENOSYS;
if (audmux_clk)
- clk_enable(audmux_clk);
+ clk_prepare_enable(audmux_clk);
writel(ptcr, audmux_base + MXC_AUDMUX_V2_PTCR(port));
writel(pdcr, audmux_base + MXC_AUDMUX_V2_PDCR(port));
if (audmux_clk)
- clk_disable(audmux_clk);
+ clk_disable_unprepare(audmux_clk);
return 0;
}
--
1.7.5.4
next prev 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 02/14] ARM: mxc: time: add clk_prepare/clk_unprepare 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 06/14] ARM: mxc: arch_reset: " Richard Zhao
2011-11-11 10:50 ` Richard Zhao [this message]
2011-11-11 10:50 ` [PATCH V3 08/14] ARM: pm-imx5: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 09/14] ARM: mx31moboard: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 10/14] ARM: mxs: " Richard Zhao
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 11/14] serial: imx: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 12/14] net: fec: " Richard Zhao
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-8-git-send-email-richard.zhao@linaro.org \
--to=richard.zhao@linaro.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).