diff options
| author | Richard Zhao <richard.zhao@linaro.org> | 2011-11-15 14:48:02 +0800 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-02-01 14:28:00 +0100 |
| commit | bac59328c8a6c7686cadb57bf2a37cf35c07deb0 (patch) | |
| tree | 68ac6d94b0707e3d2cc606967788bb0fcf283ad4 /arch/arm/plat-mxc | |
| parent | bcab50102c203927b66431b4467867bb5e104274 (diff) | |
| download | linux-bac59328c8a6c7686cadb57bf2a37cf35c07deb0.tar.gz linux-bac59328c8a6c7686cadb57bf2a37cf35c07deb0.tar.bz2 linux-bac59328c8a6c7686cadb57bf2a37cf35c07deb0.zip | |
ARM: mxc: audmux-v2: add clk_prepare/clk_unprepare
It's for migrating to generic clk framework API.
Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc')
| -rw-r--r-- | 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 8cced35009bd..0e51fc36b5be 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; } |