hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Richard Zhao 2011-11-15 14:48:02 +08:00 committed by Sascha Hauer
parent bcab50102c
commit bac59328c8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/plat-mxc/audmux-v2.c
View File

@ -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,
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;
} }