evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: pxa2xx-ac97: prepare and unprepare the clocks

Browse source 
Add the clock prepare and unprepare call to the driver initialization
phase. This will remove a warning once the PXA architecture is migrated
to the clock infrastructure.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Robert Jarzmik 2014-06-09 21:59:12 +02:00 • committed by Mark Brown
parent e1d4d3c854
commit 4091d3425a
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sound/arm/pxa2xx-ac97-lib.c
View file

@ -152,9 +152,9 @@ static inline void pxa_ac97_cold_pxa27x(void)
gsr_bits = 0; gsr_bits = 0;
/* PXA27x Developers Manual section 13.5.2.2.1 */ /* PXA27x Developers Manual section 13.5.2.2.1 */
clk_enable(ac97conf_clk); clk_prepare_enable(ac97conf_clk);
udelay(5); udelay(5);
clk_disable(ac97conf_clk); clk_disable_unprepare(ac97conf_clk);
GCR = GCR_COLD_RST | GCR_WARM_RST; GCR = GCR_COLD_RST | GCR_WARM_RST;
} }
#endif #endif
@ -299,14 +299,14 @@ static irqreturn_t pxa2xx_ac97_irq(int irq, void *dev_id)
int pxa2xx_ac97_hw_suspend(void) int pxa2xx_ac97_hw_suspend(void)
{ {
GCR |= GCR_ACLINK_OFF; GCR |= GCR_ACLINK_OFF;
clk_disable(ac97_clk); clk_disable_unprepare(ac97_clk);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_suspend); EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_suspend);
int pxa2xx_ac97_hw_resume(void) int pxa2xx_ac97_hw_resume(void)
{ {
clk_enable(ac97_clk); clk_prepare_enable(ac97_clk);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_resume); EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_resume);
@ -368,7 +368,7 @@ int pxa2xx_ac97_hw_probe(struct platform_device *dev)
goto err_clk; goto err_clk;
} }
ret = clk_enable(ac97_clk); ret = clk_prepare_enable(ac97_clk);
if (ret) if (ret)
goto err_clk2; goto err_clk2;
@ -403,7 +403,7 @@ void pxa2xx_ac97_hw_remove(struct platform_device *dev)
clk_put(ac97conf_clk); clk_put(ac97conf_clk);
ac97conf_clk = NULL; ac97conf_clk = NULL;
} }
clk_disable(ac97_clk); clk_disable_unprepare(ac97_clk);
clk_put(ac97_clk); clk_put(ac97_clk);
ac97_clk = NULL; ac97_clk = NULL;
} }