aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/arm/pxa2xx-ac97-lib.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
index 66de90ed30ca..39c3969ac1c7 100644
--- a/sound/arm/pxa2xx-ac97-lib.c
+++ b/sound/arm/pxa2xx-ac97-lib.c
@@ -152,9 +152,9 @@ static inline void pxa_ac97_cold_pxa27x(void)
152 gsr_bits = 0; 152 gsr_bits = 0;
153 153
154 /* PXA27x Developers Manual section 13.5.2.2.1 */ 154 /* PXA27x Developers Manual section 13.5.2.2.1 */
155 clk_enable(ac97conf_clk); 155 clk_prepare_enable(ac97conf_clk);
156 udelay(5); 156 udelay(5);
157 clk_disable(ac97conf_clk); 157 clk_disable_unprepare(ac97conf_clk);
158 GCR = GCR_COLD_RST | GCR_WARM_RST; 158 GCR = GCR_COLD_RST | GCR_WARM_RST;
159} 159}
160#endif 160#endif
@@ -299,14 +299,14 @@ static irqreturn_t pxa2xx_ac97_irq(int irq, void *dev_id)
299int pxa2xx_ac97_hw_suspend(void) 299int pxa2xx_ac97_hw_suspend(void)
300{ 300{
301 GCR |= GCR_ACLINK_OFF; 301 GCR |= GCR_ACLINK_OFF;
302 clk_disable(ac97_clk); 302 clk_disable_unprepare(ac97_clk);
303 return 0; 303 return 0;
304} 304}
305EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_suspend); 305EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_suspend);
306 306
307int pxa2xx_ac97_hw_resume(void) 307int pxa2xx_ac97_hw_resume(void)
308{ 308{
309 clk_enable(ac97_clk); 309 clk_prepare_enable(ac97_clk);
310 return 0; 310 return 0;
311} 311}
312EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_resume); 312EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_resume);
@@ -368,7 +368,7 @@ int pxa2xx_ac97_hw_probe(struct platform_device *dev)
368 goto err_clk; 368 goto err_clk;
369 } 369 }
370 370
371 ret = clk_enable(ac97_clk); 371 ret = clk_prepare_enable(ac97_clk);
372 if (ret) 372 if (ret)
373 goto err_clk2; 373 goto err_clk2;
374 374
@@ -403,7 +403,7 @@ void pxa2xx_ac97_hw_remove(struct platform_device *dev)
403 clk_put(ac97conf_clk); 403 clk_put(ac97conf_clk);
404 ac97conf_clk = NULL; 404 ac97conf_clk = NULL;
405 } 405 }
406 clk_disable(ac97_clk); 406 clk_disable_unprepare(ac97_clk);
407 clk_put(ac97_clk); 407 clk_put(ac97_clk);
408 ac97_clk = NULL; 408 ac97_clk = NULL;
409} 409}