Skip to content

Commit

Permalink
ASoC: samsung: s3c24xx-i2s: Move to clk_prepare_enable/clk_disable_un…
Browse files Browse the repository at this point in the history
…prepare

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>
  • Loading branch information
Vasily Khoruzhick authored and Mark Brown committed Jun 24, 2014
1 parent 77ea6bf commit c1ae59c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions sound/soc/samsung/s3c24xx-i2s.c
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ static int s3c24xx_i2s_probe(struct snd_soc_dai *dai)
pr_err("failed to get iis_clock\n");
return PTR_ERR(s3c24xx_i2s.iis_clk);
}
clk_enable(s3c24xx_i2s.iis_clk);
clk_prepare_enable(s3c24xx_i2s.iis_clk);

/* Configure the I2S pins (GPE0...GPE4) in correct mode */
s3c_gpio_cfgall_range(S3C2410_GPE(0), 5, S3C_GPIO_SFN(2),
Expand All @@ -397,15 +397,15 @@ static int s3c24xx_i2s_suspend(struct snd_soc_dai *cpu_dai)
s3c24xx_i2s.iisfcon = readl(s3c24xx_i2s.regs + S3C2410_IISFCON);
s3c24xx_i2s.iispsr = readl(s3c24xx_i2s.regs + S3C2410_IISPSR);

clk_disable(s3c24xx_i2s.iis_clk);
clk_disable_unprepare(s3c24xx_i2s.iis_clk);

return 0;
}

static int s3c24xx_i2s_resume(struct snd_soc_dai *cpu_dai)
{
pr_debug("Entered %s\n", __func__);
clk_enable(s3c24xx_i2s.iis_clk);
clk_prepare_enable(s3c24xx_i2s.iis_clk);

writel(s3c24xx_i2s.iiscon, s3c24xx_i2s.regs + S3C2410_IISCON);
writel(s3c24xx_i2s.iismod, s3c24xx_i2s.regs + S3C2410_IISMOD);
Expand Down

0 comments on commit c1ae59c

Please sign in to comment.