sound/soc: mpc5200_psc_ac97: Use gpio pins for cold reset

Call the gpio reset platform function instead of using the flawed
ac97 functionality of the MPC5200(b)

From MPC5200B User's Manual:
"Some AC97 devices goes to a test mode, if the Sync line is high
during the Res line is low (reset phase). To avoid this behavior the
Sync line must be also forced to zero during the reset phase. To do
that, the pin muxing should switch to GPIO mode and the GPIO control
register should be used to control the output lines."

Signed-off-by: Eric Millbrandt <emillbrandt@dekaresearch.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

1 files changed, 18 insertions, 4 deletions

diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c
index e2ee220bfb7e..e7f5d50ed084 100644
--- a/sound/soc/fsl/mpc5200_psc_ac97.c
+++ b/sound/soc/fsl/mpc5200_psc_ac97.c
@@ -20,6 +20,7 @@
 
 #include <asm/time.h>
 #include <asm/delay.h>
+#include <asm/mpc52xx.h>
 #include <asm/mpc52xx_psc.h>
 
 #include "mpc5200_dma.h"
@@ -100,19 +101,32 @@ static void psc_ac97_warm_reset(struct snd_ac97 *ac97)
 {
         struct mpc52xx_psc __iomem *regs = psc_dma->psc_regs;
 
+        mutex_lock(&psc_dma->mutex);
+
         out_be32(&regs->sicr, psc_dma->sicr | MPC52xx_PSC_SICR_AWR);
         udelay(3);
         out_be32(&regs->sicr, psc_dma->sicr);
+
+        mutex_unlock(&psc_dma->mutex);
 }
 
 static void psc_ac97_cold_reset(struct snd_ac97 *ac97)
 {
         struct mpc52xx_psc __iomem *regs = psc_dma->psc_regs;
 
-        /* Do a cold reset */
-        out_8(&regs->op1, MPC52xx_PSC_OP_RES);
-        udelay(10);
-        out_8(&regs->op0, MPC52xx_PSC_OP_RES);
+        mutex_lock(&psc_dma->mutex);
+        dev_dbg(psc_dma->dev, "cold reset\n");
+
+        mpc5200_psc_ac97_gpio_reset(psc_dma->id);
+
+        /* Notify the PSC that a reset has occurred */
+        out_be32(&regs->sicr, psc_dma->sicr | MPC52xx_PSC_SICR_ACRB);
+
+        /* Re-enable RX and TX */
+        out_8(&regs->command, MPC52xx_PSC_TX_ENABLE | MPC52xx_PSC_RX_ENABLE);
+
+        mutex_unlock(&psc_dma->mutex);
+
         msleep(1);
         psc_ac97_warm_reset(ac97);
 }