aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa/pxa2xx-ac97.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/pxa/pxa2xx-ac97.c')
-rw-r--r--sound/soc/pxa/pxa2xx-ac97.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index 1bbbeff84ef0..b222755763e7 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -256,7 +256,7 @@ static int pxa2xx_ac97_suspend(struct platform_device *pdev,
256 struct snd_soc_cpu_dai *dai) 256 struct snd_soc_cpu_dai *dai)
257{ 257{
258 GCR |= GCR_ACLINK_OFF; 258 GCR |= GCR_ACLINK_OFF;
259 pxa_set_cken(CKEN2_AC97, 0); 259 pxa_set_cken(CKEN_AC97, 0);
260 return 0; 260 return 0;
261} 261}
262 262
@@ -271,7 +271,7 @@ static int pxa2xx_ac97_resume(struct platform_device *pdev,
271 /* Use GPIO 113 as AC97 Reset on Bulverde */ 271 /* Use GPIO 113 as AC97 Reset on Bulverde */
272 pxa_gpio_mode(113 | GPIO_ALT_FN_2_OUT); 272 pxa_gpio_mode(113 | GPIO_ALT_FN_2_OUT);
273#endif 273#endif
274 pxa_set_cken(CKEN2_AC97, 1); 274 pxa_set_cken(CKEN_AC97, 1);
275 return 0; 275 return 0;
276} 276}
277 277
@@ -296,14 +296,14 @@ static int pxa2xx_ac97_probe(struct platform_device *pdev)
296 /* Use GPIO 113 as AC97 Reset on Bulverde */ 296 /* Use GPIO 113 as AC97 Reset on Bulverde */
297 pxa_gpio_mode(113 | GPIO_ALT_FN_2_OUT); 297 pxa_gpio_mode(113 | GPIO_ALT_FN_2_OUT);
298#endif 298#endif
299 pxa_set_cken(CKEN2_AC97, 1); 299 pxa_set_cken(CKEN_AC97, 1);
300 return 0; 300 return 0;
301 301
302 err: 302 err:
303 if (CKEN & CKEN2_AC97) { 303 if (CKEN & CKEN_AC97) {
304 GCR |= GCR_ACLINK_OFF; 304 GCR |= GCR_ACLINK_OFF;
305 free_irq(IRQ_AC97, NULL); 305 free_irq(IRQ_AC97, NULL);
306 pxa_set_cken(CKEN2_AC97, 0); 306 pxa_set_cken(CKEN_AC97, 0);
307 } 307 }
308 return ret; 308 return ret;
309} 309}
@@ -312,7 +312,7 @@ static void pxa2xx_ac97_remove(struct platform_device *pdev)
312{ 312{
313 GCR |= GCR_ACLINK_OFF; 313 GCR |= GCR_ACLINK_OFF;
314 free_irq(IRQ_AC97, NULL); 314 free_irq(IRQ_AC97, NULL);
315 pxa_set_cken(CKEN2_AC97, 0); 315 pxa_set_cken(CKEN_AC97, 0);
316} 316}
317 317
318static int pxa2xx_ac97_hw_params(struct snd_pcm_substream *substream, 318static int pxa2xx_ac97_hw_params(struct snd_pcm_substream *substream,