]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ASoC: mxs-saif: convert to clk_prepare/clk_unprepare
authorShawn Guo <shawn.guo@linaro.org>
Tue, 20 Dec 2011 06:15:44 +0000 (14:15 +0800)
committerShawn Guo <shawn.guo@linaro.org>
Wed, 28 Dec 2011 13:31:57 +0000 (21:31 +0800)
The patch converts mxs-saif driver to clk_prepare/clk_unprepare by
using helper functions clk_prepare_enable/clk_disable_unprepare.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Dong Aisheng <b29396@freescale.com>
Cc: Liam Girdwood <lrg@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
sound/soc/mxs/mxs-saif.c

index 76dc74d24fc2ff7b50b9665b7443c56372c70b7c..ef1abb53af952b7133c76d8beea2cd896625f492 100644 (file)
@@ -210,7 +210,7 @@ int mxs_saif_put_mclk(unsigned int saif_id)
                return -EBUSY;
        }
 
-       clk_disable(saif->clk);
+       clk_disable_unprepare(saif->clk);
 
        /* disable MCLK output */
        __raw_writel(BM_SAIF_CTRL_CLKGATE,
@@ -264,7 +264,7 @@ int mxs_saif_get_mclk(unsigned int saif_id, unsigned int mclk,
        if (ret)
                return ret;
 
-       ret = clk_enable(saif->clk);
+       ret = clk_prepare_enable(saif->clk);
        if (ret)
                return ret;