git.openwrt.org Git - openwrt/staging/hauke.git/blob

   1 From 480565647b43c25ae86c635f88ae99f036f4e63a Mon Sep 17 00:00:00 2001
   2 From: Dong Aisheng <aisheng.dong@nxp.com>
   3 Date: Fri, 16 Aug 2019 18:01:33 +0800
   4 Subject: [PATCH] Revert "ASoC: fsl_sai: Update Tx/Rx channel enable mask"
   5
   6 This reverts commit b84f50b0fcb497a62068926fca793d2d213c7dbd.
   7 ---
   8  sound/soc/fsl/fsl_sai.c | 6 ++----
   9  sound/soc/fsl/fsl_sai.h | 1 -
  10  2 files changed, 2 insertions(+), 5 deletions(-)
  11
  12 --- a/sound/soc/fsl/fsl_sai.c
  13 +++ b/sound/soc/fsl/fsl_sai.c
  14 @@ -599,8 +599,7 @@ static int fsl_sai_startup(struct snd_pc
  15         bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
  16         int ret;
  17
  18 -       regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx),
  19 -                          FSL_SAI_CR3_TRCE_MASK,
  20 +       regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx), FSL_SAI_CR3_TRCE,
  21                            FSL_SAI_CR3_TRCE);
  22
  23         ret = snd_pcm_hw_constraint_list(substream->runtime, 0,
  24 @@ -615,8 +614,7 @@ static void fsl_sai_shutdown(struct snd_
  25         struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai);
  26         bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
  27
  28 -       regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx),
  29 -                          FSL_SAI_CR3_TRCE_MASK, 0);
  30 +       regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx), FSL_SAI_CR3_TRCE, 0);
  31  }
  32
  33  static const struct snd_soc_dai_ops fsl_sai_pcm_dai_ops = {
  34 --- a/sound/soc/fsl/fsl_sai.h
  35 +++ b/sound/soc/fsl/fsl_sai.h
  36 @@ -110,7 +110,6 @@
  37
  38  /* SAI Transmit and Receive Configuration 3 Register */
  39  #define FSL_SAI_CR3_TRCE       BIT(16)
  40 -#define FSL_SAI_CR3_TRCE_MASK  GENMASK(23, 16)
  41  #define FSL_SAI_CR3_WDFL(x)    (x)
  42  #define FSL_SAI_CR3_WDFL_MASK  0x1f
  43