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