ENGR00273838-2 ASoC: fsl: Enable and disable Tx/Rx DMA symmetrically

Enable DMA when TRIGGER_START, and disable it when TRIGGER_STOP,
otherwise the hardware dma request would not be clearred even if
SSI is disabled.

Acked-by: Wang Shengjiu <b02247@freescale.com>
Signed-off-by: Nicolin Chen <b42378@freescale.com>

1 files changed, 13 insertions, 9 deletions

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index fd171fdcf932..888feb6cdd1c 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -105,10 +105,9 @@ void dump_reg(struct ccsr_ssi __iomem *ssi) {}
 #endif
 
 /* SIER bitflag of interrupts to enable */
-#define SIER_FLAGS (CCSR_SSI_SIER_TFRC_EN | CCSR_SSI_SIER_TDMAE | \
-                    CCSR_SSI_SIER_TIE | CCSR_SSI_SIER_TUE0_EN | \
-                    CCSR_SSI_SIER_TUE1_EN | CCSR_SSI_SIER_RFRC_EN | \
-                    CCSR_SSI_SIER_RDMAE | CCSR_SSI_SIER_RIE | \
+#define SIER_FLAGS (CCSR_SSI_SIER_TFRC_EN | CCSR_SSI_SIER_TIE | \
+                    CCSR_SSI_SIER_TUE0_EN | CCSR_SSI_SIER_TUE1_EN | \
+                    CCSR_SSI_SIER_RFRC_EN | CCSR_SSI_SIER_RIE | \
                     CCSR_SSI_SIER_ROE0_EN | CCSR_SSI_SIER_ROE1_EN)
 
 /**
@@ -512,22 +511,27 @@ static int fsl_ssi_trigger(struct snd_pcm_substream *substream, int cmd,
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                         write_ssi_mask(&ssi->scr, 0,
                                 CCSR_SSI_SCR_SSIEN | CCSR_SSI_SCR_TE);
-                else
+                        write_ssi_mask(&ssi->sier, 0, CCSR_SSI_SIER_TDMAE);
+                } else {
                         write_ssi_mask(&ssi->scr, 0,
                                 CCSR_SSI_SCR_SSIEN | CCSR_SSI_SCR_RE);
+                        write_ssi_mask(&ssi->sier, 0, CCSR_SSI_SIER_RDMAE);
+                }
                 dump_reg(ssi);
                 break;
 
         case SNDRV_PCM_TRIGGER_STOP:
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                         write_ssi_mask(&ssi->scr, CCSR_SSI_SCR_TE, 0);
-                else
+                        write_ssi_mask(&ssi->sier, CCSR_SSI_SIER_TDMAE, 0);
+                } else {
                         write_ssi_mask(&ssi->scr, CCSR_SSI_SCR_RE, 0);
-
+                        write_ssi_mask(&ssi->sier, CCSR_SSI_SIER_RDMAE, 0);
+                }
                 if ((read_ssi(&ssi->scr) & (CCSR_SSI_SCR_TE | CCSR_SSI_SCR_RE)) == 0)
                         write_ssi_mask(&ssi->scr, CCSR_SSI_SCR_SSIEN, 0);
                 break;