aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa/pxa2xx-i2s.c
diff options
context:
space:
mode:
authorPhilipp Zabel <philipp.zabel@gmail.com>2012-03-15 14:16:12 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-01 06:28:23 -0400
commit5f1cba63a3a65b01a70ac09914176bb3719725d6 (patch)
tree8df50aa85124476f2d8ca0b0359d9c642feafa64 /sound/soc/pxa/pxa2xx-i2s.c
parentb19e6e7b763c7144bfe2ceccf988b64d66d6dd0a (diff)
ASoC: pxa2xx-i2s: Add clk_prepare/clk_unprepare calls
This patch adds clk_prepare/clk_unprepare calls to the pxa2xx-i2s driver by using the helper functions clk_prepare_enable and clk_disable_unprepare. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/pxa/pxa2xx-i2s.c')
-rw-r--r--sound/soc/pxa/pxa2xx-i2s.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index 609abd51e55f..453b0925a0b5 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -165,7 +165,7 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream,
165 struct pxa2xx_pcm_dma_params *dma_data; 165 struct pxa2xx_pcm_dma_params *dma_data;
166 166
167 BUG_ON(IS_ERR(clk_i2s)); 167 BUG_ON(IS_ERR(clk_i2s));
168 clk_enable(clk_i2s); 168 clk_prepare_enable(clk_i2s);
169 clk_ena = 1; 169 clk_ena = 1;
170 pxa_i2s_wait(); 170 pxa_i2s_wait();
171 171
@@ -258,7 +258,7 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream,
258 SACR0 &= ~SACR0_ENB; 258 SACR0 &= ~SACR0_ENB;
259 pxa_i2s_wait(); 259 pxa_i2s_wait();
260 if (clk_ena) { 260 if (clk_ena) {
261 clk_disable(clk_i2s); 261 clk_disable_unprepare(clk_i2s);
262 clk_ena = 0; 262 clk_ena = 0;
263 } 263 }
264 } 264 }