aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/samsung
diff options
context:
space:
mode:
authorVasily Khoruzhick <anarsoul@gmail.com>2014-06-23 16:24:07 -0400
committerMark Brown <broonie@linaro.org>2014-06-24 06:57:43 -0400
commitc1ae59c7bd75e5f861d913a238f659b38ff4a07b (patch)
treec066e4b75adbd51a916adc5353e23657c7c2cccb /sound/soc/samsung
parent77ea6bf777b08ef1c5a44b6c1548cff449a96de7 (diff)
ASoC: samsung: s3c24xx-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')
-rw-r--r--sound/soc/samsung/s3c24xx-i2s.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c
index 6f3ee87da722..e8b98528e356 100644
--- a/sound/soc/samsung/s3c24xx-i2s.c
+++ b/sound/soc/samsung/s3c24xx-i2s.c
@@ -373,7 +373,7 @@ static int s3c24xx_i2s_probe(struct snd_soc_dai *dai)
373 pr_err("failed to get iis_clock\n"); 373 pr_err("failed to get iis_clock\n");
374 return PTR_ERR(s3c24xx_i2s.iis_clk); 374 return PTR_ERR(s3c24xx_i2s.iis_clk);
375 } 375 }
376 clk_enable(s3c24xx_i2s.iis_clk); 376 clk_prepare_enable(s3c24xx_i2s.iis_clk);
377 377
378 /* Configure the I2S pins (GPE0...GPE4) in correct mode */ 378 /* Configure the I2S pins (GPE0...GPE4) in correct mode */
379 s3c_gpio_cfgall_range(S3C2410_GPE(0), 5, S3C_GPIO_SFN(2), 379 s3c_gpio_cfgall_range(S3C2410_GPE(0), 5, S3C_GPIO_SFN(2),
@@ -397,7 +397,7 @@ static int s3c24xx_i2s_suspend(struct snd_soc_dai *cpu_dai)
397 s3c24xx_i2s.iisfcon = readl(s3c24xx_i2s.regs + S3C2410_IISFCON); 397 s3c24xx_i2s.iisfcon = readl(s3c24xx_i2s.regs + S3C2410_IISFCON);
398 s3c24xx_i2s.iispsr = readl(s3c24xx_i2s.regs + S3C2410_IISPSR); 398 s3c24xx_i2s.iispsr = readl(s3c24xx_i2s.regs + S3C2410_IISPSR);
399 399
400 clk_disable(s3c24xx_i2s.iis_clk); 400 clk_disable_unprepare(s3c24xx_i2s.iis_clk);
401 401
402 return 0; 402 return 0;
403} 403}
@@ -405,7 +405,7 @@ static int s3c24xx_i2s_suspend(struct snd_soc_dai *cpu_dai)
405static int s3c24xx_i2s_resume(struct snd_soc_dai *cpu_dai) 405static int s3c24xx_i2s_resume(struct snd_soc_dai *cpu_dai)
406{ 406{
407 pr_debug("Entered %s\n", __func__); 407 pr_debug("Entered %s\n", __func__);
408 clk_enable(s3c24xx_i2s.iis_clk); 408 clk_prepare_enable(s3c24xx_i2s.iis_clk);
409 409
410 writel(s3c24xx_i2s.iiscon, s3c24xx_i2s.regs + S3C2410_IISCON); 410 writel(s3c24xx_i2s.iiscon, s3c24xx_i2s.regs + S3C2410_IISCON);
411 writel(s3c24xx_i2s.iismod, s3c24xx_i2s.regs + S3C2410_IISMOD); 411 writel(s3c24xx_i2s.iismod, s3c24xx_i2s.regs + S3C2410_IISMOD);