diff options
author | Nicolin Chen <Guangyu.Chen@freescale.com> | 2014-07-23 03:40:22 -0400 |
---|---|---|
committer | Nicolin Chen <Guangyu.Chen@freescale.com> | 2014-07-23 03:57:51 -0400 |
commit | 5762c7ac48745d41c64aac483ce3070e10a4306c (patch) | |
tree | 1769e0b5bf59c0269f907bdb9e1e3b37231330de /sound/soc/fsl | |
parent | b77b5205175fdbd7445bb3125bfac237614ebc8e (diff) |
ENGR00324009 Revert "ENGR00323404-1 ASoC: fsl_sai: Reset FIFOs after disabling TE/RE"
Patch "ASoC: fsl_sai: Reset FIFOs after disabling TE/RE" may accidentally
increase the underrun rate of SAI.
To keep an equal quality as previous release, we decide to revert this patch
and find a thorough way to reset the FIFO later.
This reverts commit b85f840a60de8d0a5ca8fbe7eda15f611ff5b622.
Acked-by: Wang Shengjiu <b02247@freescale.com>
Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>
Diffstat (limited to 'sound/soc/fsl')
-rw-r--r-- | sound/soc/fsl/fsl_sai.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index cdff65b14dbd..57a020a72a5e 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c | |||
@@ -371,15 +371,10 @@ static int fsl_sai_trigger(struct snd_pcm_substream *substream, int cmd, | |||
371 | 371 | ||
372 | /* Check if the opposite FRDE is also disabled */ | 372 | /* Check if the opposite FRDE is also disabled */ |
373 | if (!(tx ? rcsr & FSL_SAI_CSR_FRDE : tcsr & FSL_SAI_CSR_FRDE)) { | 373 | if (!(tx ? rcsr & FSL_SAI_CSR_FRDE : tcsr & FSL_SAI_CSR_FRDE)) { |
374 | /* Disable both directions and reset their FIFOs */ | ||
375 | regmap_update_bits(sai->regmap, FSL_SAI_TCSR, | 374 | regmap_update_bits(sai->regmap, FSL_SAI_TCSR, |
376 | FSL_SAI_CSR_TERE, 0); | 375 | FSL_SAI_CSR_TERE, 0); |
377 | regmap_update_bits(sai->regmap, FSL_SAI_RCSR, | 376 | regmap_update_bits(sai->regmap, FSL_SAI_RCSR, |
378 | FSL_SAI_CSR_TERE, 0); | 377 | FSL_SAI_CSR_TERE, 0); |
379 | regmap_update_bits(sai->regmap, FSL_SAI_TCSR, | ||
380 | FSL_SAI_CSR_FR, FSL_SAI_CSR_FR); | ||
381 | regmap_update_bits(sai->regmap, FSL_SAI_RCSR, | ||
382 | FSL_SAI_CSR_FR, FSL_SAI_CSR_FR); | ||
383 | } | 378 | } |
384 | break; | 379 | break; |
385 | default: | 380 | default: |