summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-01-03 21:34:14 +0100
committerArnd Bergmann <arnd@arndb.de>2012-01-03 21:34:14 +0100
commite1482a1708e48add8d2f4ecc949885e0e552d9e8 (patch)
treeab97efb5785f77ed83292c97ba9e5909cfee8fba /sound
parentLinux 3.2-rc7 (diff)
parentARM: mxs: select HAVE_CLK_PREPARE for clock (diff)
downloadlinux-e1482a1708e48add8d2f4ecc949885e0e552d9e8.tar.xz
linux-e1482a1708e48add8d2f4ecc949885e0e552d9e8.zip
Merge branch 'mxs/clk-prepare' of git://git.linaro.org/people/shawnguo/linux-2.6 into imx/clk
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;