1 files changed, 5 insertions, 13 deletions

diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index d94a495bd6bd..ac8f227bab0b 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -244,7 +244,7 @@ struct snd_ac97_bus_ops soc_ac97_ops = {
 static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_stereo_out = {
         .name                   = "AC97 PCM Stereo out",
         .dev_addr               = __PREG(PCDR),
-        .drcmr                  = &DRCMRTXPCDR,
+        .drcmr                  = &DRCMR(12),
         .dcmd                   = DCMD_INCSRCADDR | DCMD_FLOWTRG |
                                   DCMD_BURST32 | DCMD_WIDTH4,
 };
@@ -252,7 +252,7 @@ static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_stereo_out = {
 static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_stereo_in = {
         .name                   = "AC97 PCM Stereo in",
         .dev_addr               = __PREG(PCDR),
-        .drcmr                  = &DRCMRRXPCDR,
+        .drcmr                  = &DRCMR(11),
         .dcmd                   = DCMD_INCTRGADDR | DCMD_FLOWSRC |
                                   DCMD_BURST32 | DCMD_WIDTH4,
 };
@@ -260,7 +260,7 @@ static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_stereo_in = {
 static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_aux_mono_out = {
         .name                   = "AC97 Aux PCM (Slot 5) Mono out",
         .dev_addr               = __PREG(MODR),
-        .drcmr                  = &DRCMRTXMODR,
+        .drcmr                  = &DRCMR(10),
         .dcmd                   = DCMD_INCSRCADDR | DCMD_FLOWTRG |
                                   DCMD_BURST16 | DCMD_WIDTH2,
 };
@@ -268,7 +268,7 @@ static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_aux_mono_out = {
 static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_aux_mono_in = {
         .name                   = "AC97 Aux PCM (Slot 5) Mono in",
         .dev_addr               = __PREG(MODR),
-        .drcmr                  = &DRCMRRXMODR,
+        .drcmr                  = &DRCMR(9),
         .dcmd                   = DCMD_INCTRGADDR | DCMD_FLOWSRC |
                                   DCMD_BURST16 | DCMD_WIDTH2,
 };
@@ -276,7 +276,7 @@ static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_aux_mono_in = {
 static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_mic_mono_in = {
         .name                   = "AC97 Mic PCM (Slot 6) Mono in",
         .dev_addr               = __PREG(MCDR),
-        .drcmr                  = &DRCMRRXMCDR,
+        .drcmr                  = &DRCMR(8),
         .dcmd                   = DCMD_INCTRGADDR | DCMD_FLOWSRC |
                                   DCMD_BURST16 | DCMD_WIDTH2,
 };
@@ -293,14 +293,6 @@ static int pxa2xx_ac97_suspend(struct platform_device *pdev,
 static int pxa2xx_ac97_resume(struct platform_device *pdev,
         struct snd_soc_dai *dai)
 {
-        pxa_gpio_mode(GPIO31_SYNC_AC97_MD);
-        pxa_gpio_mode(GPIO30_SDATA_OUT_AC97_MD);
-        pxa_gpio_mode(GPIO28_BITCLK_AC97_MD);
-        pxa_gpio_mode(GPIO29_SDATA_IN_AC97_MD);
-#ifdef CONFIG_PXA27x
-        /* Use GPIO 113 as AC97 Reset on Bulverde */
-        pxa_gpio_mode(113 | GPIO_ALT_FN_2_OUT);
-#endif
         clk_enable(ac97_clk);
         return 0;
 }