Commit bac59328 authored by Richard Zhao's avatar Richard Zhao Committed by Sascha Hauer

ARM: mxc: audmux-v2: add clk_prepare/clk_unprepare

It's for migrating to generic clk framework API.
Signed-off-by: default avatarRichard Zhao <richard.zhao@linaro.org>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent bcab5010
...@@ -73,13 +73,13 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf, ...@@ -73,13 +73,13 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
return -ENOMEM; return -ENOMEM;
if (audmux_clk) if (audmux_clk)
clk_enable(audmux_clk); clk_prepare_enable(audmux_clk);
ptcr = readl(audmux_base + MXC_AUDMUX_V2_PTCR(port)); ptcr = readl(audmux_base + MXC_AUDMUX_V2_PTCR(port));
pdcr = readl(audmux_base + MXC_AUDMUX_V2_PDCR(port)); pdcr = readl(audmux_base + MXC_AUDMUX_V2_PDCR(port));
if (audmux_clk) if (audmux_clk)
clk_disable(audmux_clk); clk_disable_unprepare(audmux_clk);
ret = snprintf(buf, PAGE_SIZE, "PDCR: %08x\nPTCR: %08x\n", ret = snprintf(buf, PAGE_SIZE, "PDCR: %08x\nPTCR: %08x\n",
pdcr, ptcr); pdcr, ptcr);
...@@ -172,13 +172,13 @@ int mxc_audmux_v2_configure_port(unsigned int port, unsigned int ptcr, ...@@ -172,13 +172,13 @@ int mxc_audmux_v2_configure_port(unsigned int port, unsigned int ptcr,
return -ENOSYS; return -ENOSYS;
if (audmux_clk) if (audmux_clk)
clk_enable(audmux_clk); clk_prepare_enable(audmux_clk);
writel(ptcr, audmux_base + MXC_AUDMUX_V2_PTCR(port)); writel(ptcr, audmux_base + MXC_AUDMUX_V2_PTCR(port));
writel(pdcr, audmux_base + MXC_AUDMUX_V2_PDCR(port)); writel(pdcr, audmux_base + MXC_AUDMUX_V2_PDCR(port));
if (audmux_clk) if (audmux_clk)
clk_disable(audmux_clk); clk_disable_unprepare(audmux_clk);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment