aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRichard Zhao <richard.zhao@linaro.org>2011-11-15 01:48:02 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2012-02-01 08:28:00 -0500
commitbac59328c8a6c7686cadb57bf2a37cf35c07deb0 (patch)
tree68ac6d94b0707e3d2cc606967788bb0fcf283ad4 /arch/arm
parentbcab50102c203927b66431b4467867bb5e104274 (diff)
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')
-rw-r--r--arch/arm/plat-mxc/audmux-v2.c8
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,
73 return -ENOMEM; 73 return -ENOMEM;
74 74
75 if (audmux_clk) 75 if (audmux_clk)
76 clk_enable(audmux_clk); 76 clk_prepare_enable(audmux_clk);
77 77
78 ptcr = readl(audmux_base + MXC_AUDMUX_V2_PTCR(port)); 78 ptcr = readl(audmux_base + MXC_AUDMUX_V2_PTCR(port));
79 pdcr = readl(audmux_base + MXC_AUDMUX_V2_PDCR(port)); 79 pdcr = readl(audmux_base + MXC_AUDMUX_V2_PDCR(port));
80 80
81 if (audmux_clk) 81 if (audmux_clk)
82 clk_disable(audmux_clk); 82 clk_disable_unprepare(audmux_clk);
83 83
84 ret = snprintf(buf, PAGE_SIZE, "PDCR: %08x\nPTCR: %08x\n", 84 ret = snprintf(buf, PAGE_SIZE, "PDCR: %08x\nPTCR: %08x\n",
85 pdcr, ptcr); 85 pdcr, ptcr);
@@ -172,13 +172,13 @@ int mxc_audmux_v2_configure_port(unsigned int port, unsigned int ptcr,
172 return -ENOSYS; 172 return -ENOSYS;
173 173
174 if (audmux_clk) 174 if (audmux_clk)
175 clk_enable(audmux_clk); 175 clk_prepare_enable(audmux_clk);
176 176
177 writel(ptcr, audmux_base + MXC_AUDMUX_V2_PTCR(port)); 177 writel(ptcr, audmux_base + MXC_AUDMUX_V2_PTCR(port));
178 writel(pdcr, audmux_base + MXC_AUDMUX_V2_PDCR(port)); 178 writel(pdcr, audmux_base + MXC_AUDMUX_V2_PDCR(port));
179 179
180 if (audmux_clk) 180 if (audmux_clk)
181 clk_disable(audmux_clk); 181 clk_disable_unprepare(audmux_clk);
182 182
183 return 0; 183 return 0;
184} 184}