summaryrefslogtreecommitdiff
path: root/sound/soc/samsung/s3c2412-i2s.c
diff options
context:
space:
mode:
authorVasily Khoruzhick <anarsoul@gmail.com>2014-06-23 23:24:06 +0300
committerMark Brown <broonie@linaro.org>2014-06-24 11:57:43 +0100
commit77ea6bf777b08ef1c5a44b6c1548cff449a96de7 (patch)
treec0c860f8be4fe85ae574cb658db7d59fb7df3182 /sound/soc/samsung/s3c2412-i2s.c
parentae602456e83c9242f752f8176ebe658e37d4f90d (diff)
ASoC: samsung: s3c2412-i2s: Move to clk_prepare_enable/clk_disable_unprepare
Use clk_prepare_enable/clk_disable_unprepare to make the driver work properly with common clock framework. Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/samsung/s3c2412-i2s.c')
-rw-r--r--sound/soc/samsung/s3c2412-i2s.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c
index d9d27cc0657c..d6bc6dc0aafb 100644
--- a/sound/soc/samsung/s3c2412-i2s.c
+++ b/sound/soc/samsung/s3c2412-i2s.c
@@ -76,7 +76,7 @@ static int s3c2412_i2s_probe(struct snd_soc_dai *dai)
/* Set MPLL as the source for IIS CLK */
clk_set_parent(s3c2412_i2s.iis_cclk, clk_get(NULL, "mpll"));
- clk_enable(s3c2412_i2s.iis_cclk);
+ clk_prepare_enable(s3c2412_i2s.iis_cclk);
s3c2412_i2s.iis_cclk = s3c2412_i2s.iis_pclk;
@@ -89,7 +89,7 @@ static int s3c2412_i2s_probe(struct snd_soc_dai *dai)
static int s3c2412_i2s_remove(struct snd_soc_dai *dai)
{
- clk_disable(s3c2412_i2s.iis_cclk);
+ clk_disable_unprepare(s3c2412_i2s.iis_cclk);
return 0;
}