Skip to content

Commit

Permalink
ARM: mxc: audmux-v2: add clk_prepare/clk_unprepare
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Richard Zhao authored and Sascha Hauer committed Feb 1, 2012
1 parent bcab501 commit bac5932
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/arm/plat-mxc/audmux-v2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit bac5932

Please sign in to comment.