diff options
author | Thomas Abraham <thomas.abraham@linaro.org> | 2012-10-02 19:46:58 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-14 22:29:37 -0400 |
commit | 98614cf68905961abcbab71dea8b3d9054a55d36 (patch) | |
tree | 879624da988b353dd660f0d84fdfd34c6dfc49a5 /sound/soc | |
parent | 54f174ab292aa7dec0d7daac6d5654492e40296a (diff) |
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>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/samsung/i2s.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 40b00a13dcd1..547b9190c88f 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c | |||
@@ -423,7 +423,7 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai, | |||
423 | if (i2s->op_clk) { | 423 | if (i2s->op_clk) { |
424 | if ((clk_id && !(mod & MOD_IMS_SYSMUX)) || | 424 | if ((clk_id && !(mod & MOD_IMS_SYSMUX)) || |
425 | (!clk_id && (mod & MOD_IMS_SYSMUX))) { | 425 | (!clk_id && (mod & MOD_IMS_SYSMUX))) { |
426 | clk_disable(i2s->op_clk); | 426 | clk_disable_unprepare(i2s->op_clk); |
427 | clk_put(i2s->op_clk); | 427 | clk_put(i2s->op_clk); |
428 | } else { | 428 | } else { |
429 | i2s->rclk_srcrate = | 429 | i2s->rclk_srcrate = |
@@ -434,7 +434,7 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai, | |||
434 | 434 | ||
435 | i2s->op_clk = clk_get(&i2s->pdev->dev, | 435 | i2s->op_clk = clk_get(&i2s->pdev->dev, |
436 | i2s->src_clk[clk_id]); | 436 | i2s->src_clk[clk_id]); |
437 | clk_enable(i2s->op_clk); | 437 | clk_prepare_enable(i2s->op_clk); |
438 | i2s->rclk_srcrate = clk_get_rate(i2s->op_clk); | 438 | i2s->rclk_srcrate = clk_get_rate(i2s->op_clk); |
439 | 439 | ||
440 | /* Over-ride the other's */ | 440 | /* Over-ride the other's */ |
@@ -880,7 +880,7 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai) | |||
880 | iounmap(i2s->addr); | 880 | iounmap(i2s->addr); |
881 | return -ENOENT; | 881 | return -ENOENT; |
882 | } | 882 | } |
883 | clk_enable(i2s->clk); | 883 | clk_prepare_enable(i2s->clk); |
884 | 884 | ||
885 | if (other) { | 885 | if (other) { |
886 | other->addr = i2s->addr; | 886 | other->addr = i2s->addr; |
@@ -922,7 +922,7 @@ static int samsung_i2s_dai_remove(struct snd_soc_dai *dai) | |||
922 | if (i2s->quirks & QUIRK_NEED_RSTCLR) | 922 | if (i2s->quirks & QUIRK_NEED_RSTCLR) |
923 | writel(0, i2s->addr + I2SCON); | 923 | writel(0, i2s->addr + I2SCON); |
924 | 924 | ||
925 | clk_disable(i2s->clk); | 925 | clk_disable_unprepare(i2s->clk); |
926 | clk_put(i2s->clk); | 926 | clk_put(i2s->clk); |
927 | 927 | ||
928 | iounmap(i2s->addr); | 928 | iounmap(i2s->addr); |