Skip to contentSkip to conversation

ASoC: pxa2xx-i2s: Add clk_prepare/clk_unprepare calls

PATCH Applied Philipp Zabel 2 participants 2 messages Mar 15, 2012 – Mar 17, 2012

Subsystems (3)
Sound ASoC PXA2xx/PXA3xx support
lore
Share & tools
lore

Philipp Zabel

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
Cc Haojian Zhuang <[email protected]>
Cc Eric Miao <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc Mark Brown <[email protected]>
---
 sound/soc/pxa/pxa2xx-i2s.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
sound/soc/pxa/pxa2xx-i2s.c +2 -2
index 609abd5..453b092 100644
@@ -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;
 		}
 	}
Signature · 1 line
1.7.9.1
Applied
#1 lore raw
Quoted 3 lines · Philipp Zabel

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.

Applied, thanks. There's probably a reasonable case for a coccinelle based conversion over the tree as a whole here...