diff options
| author | Vasily Khoruzhick <anarsoul@gmail.com> | 2014-06-23 16:24:06 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-24 06:57:43 -0400 |
| commit | 77ea6bf777b08ef1c5a44b6c1548cff449a96de7 (patch) | |
| tree | c0c860f8be4fe85ae574cb658db7d59fb7df3182 | |
| parent | ae602456e83c9242f752f8176ebe658e37d4f90d (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>
| -rw-r--r-- | sound/soc/samsung/s3c2412-i2s.c | 4 |
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) | |||
| 76 | /* Set MPLL as the source for IIS CLK */ | 76 | /* Set MPLL as the source for IIS CLK */ |
| 77 | 77 | ||
| 78 | clk_set_parent(s3c2412_i2s.iis_cclk, clk_get(NULL, "mpll")); | 78 | clk_set_parent(s3c2412_i2s.iis_cclk, clk_get(NULL, "mpll")); |
| 79 | clk_enable(s3c2412_i2s.iis_cclk); | 79 | clk_prepare_enable(s3c2412_i2s.iis_cclk); |
| 80 | 80 | ||
| 81 | s3c2412_i2s.iis_cclk = s3c2412_i2s.iis_pclk; | 81 | s3c2412_i2s.iis_cclk = s3c2412_i2s.iis_pclk; |
| 82 | 82 | ||
| @@ -89,7 +89,7 @@ static int s3c2412_i2s_probe(struct snd_soc_dai *dai) | |||
| 89 | 89 | ||
| 90 | static int s3c2412_i2s_remove(struct snd_soc_dai *dai) | 90 | static int s3c2412_i2s_remove(struct snd_soc_dai *dai) |
| 91 | { | 91 | { |
| 92 | clk_disable(s3c2412_i2s.iis_cclk); | 92 | clk_disable_unprepare(s3c2412_i2s.iis_cclk); |
| 93 | 93 | ||
| 94 | return 0; | 94 | return 0; |
| 95 | } | 95 | } |
