summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2011-12-20 07:15:44 +0100
committerShawn Guo <shawn.guo@linaro.org>2011-12-28 14:31:57 +0100
commit67939b22dadd6c5cbf7a4abe9eaec3a8415569a7 (patch)
treea1452a8b36a1e88f940c2d3d697db175f9470ddd /sound
parentvideo: mxsfb: convert to clk_prepare/clk_unprepare (diff)
downloadlinux-67939b22dadd6c5cbf7a4abe9eaec3a8415569a7.tar.xz
linux-67939b22dadd6c5cbf7a4abe9eaec3a8415569a7.zip
ASoC: mxs-saif: convert to clk_prepare/clk_unprepare
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/mxs/mxs-saif.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index 76dc74d24fc2..ef1abb53af95 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -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;