]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: mxc: audmux-v2: add clk_prepare/clk_unprepare
authorRichard Zhao <richard.zhao@linaro.org>
Tue, 15 Nov 2011 06:48:02 +0000 (14:48 +0800)
committerSascha Hauer <s.hauer@pengutronix.de>
Wed, 1 Feb 2012 13:28:00 +0000 (14:28 +0100)
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>
arch/arm/plat-mxc/audmux-v2.c

index 8cced35009bd6c1fcb3388772582a26e766c1f1b..0e51fc36b5be67660b646ea476436e471084e22d 100644 (file)
@@ -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;
 }