openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: SAMSUNG: i2s: use clk_prepare_enable and clk_disable_unprepare 

Convert clk_enable/clk_disable to clk_prepare_enable/clk_disable_unprepare
calls as required by common clock framework.

Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Acked-by: Sangbeom Kim <sbkim73@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Thomas Abraham 2012-10-03 08:46:58 +09:00 committed by Mark Brown
parent 54f174ab29
commit 98614cf689
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/samsung/i2s.c
View File

@ -423,7 +423,7 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai,
if (i2s->op_clk) { if (i2s->op_clk) {
if ((clk_id && !(mod & MOD_IMS_SYSMUX)) || if ((clk_id && !(mod & MOD_IMS_SYSMUX)) ||
(!clk_id && (mod & MOD_IMS_SYSMUX))) { (!clk_id && (mod & MOD_IMS_SYSMUX))) {
clk_disable(i2s->op_clk); clk_disable_unprepare(i2s->op_clk);
clk_put(i2s->op_clk); clk_put(i2s->op_clk);
} else { } else {
i2s->rclk_srcrate = i2s->rclk_srcrate =
@ -434,7 +434,7 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai,
i2s->op_clk = clk_get(&i2s->pdev->dev, i2s->op_clk = clk_get(&i2s->pdev->dev,
i2s->src_clk[clk_id]); i2s->src_clk[clk_id]);
clk_enable(i2s->op_clk); clk_prepare_enable(i2s->op_clk);
i2s->rclk_srcrate = clk_get_rate(i2s->op_clk); i2s->rclk_srcrate = clk_get_rate(i2s->op_clk);
/* Over-ride the other's */ /* Over-ride the other's */
@ -880,7 +880,7 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai)
iounmap(i2s->addr); iounmap(i2s->addr);
return -ENOENT; return -ENOENT;
} }
clk_enable(i2s->clk); clk_prepare_enable(i2s->clk);
if (other) { if (other) {
other->addr = i2s->addr; other->addr = i2s->addr;
@ -922,7 +922,7 @@ static int samsung_i2s_dai_remove(struct snd_soc_dai *dai)
if (i2s->quirks & QUIRK_NEED_RSTCLR) if (i2s->quirks & QUIRK_NEED_RSTCLR)
writel(0, i2s->addr + I2SCON); writel(0, i2s->addr + I2SCON);
clk_disable(i2s->clk); clk_disable_unprepare(i2s->clk);
clk_put(i2s->clk); clk_put(i2s->clk);
iounmap(i2s->addr); iounmap(i2s->addr);