ASoC: pxa2xx-i2s: Add clk_prepare/clk_unprepare calls
authorPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 15 Mar 2012 18:16:12 +0000 (19:16 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 1 Apr 2012 10:28:23 +0000 (11:28 +0100)
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>
sound/soc/pxa/pxa2xx-i2s.c

index 609abd5..453b092 100644 (file)
@@ -165,7 +165,7 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream,
        struct pxa2xx_pcm_dma_params *dma_data;
 
        BUG_ON(IS_ERR(clk_i2s));
-       clk_enable(clk_i2s);
+       clk_prepare_enable(clk_i2s);
        clk_ena = 1;
        pxa_i2s_wait();
 
@@ -258,7 +258,7 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream,
                SACR0 &= ~SACR0_ENB;
                pxa_i2s_wait();
                if (clk_ena) {
-                       clk_disable(clk_i2s);
+                       clk_disable_unprepare(clk_i2s);
                        clk_ena = 0;
                }
        }