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

   1 From 23212c6c5fcee8c1a317b5beb73c89374751de7b Mon Sep 17 00:00:00 2001
   2 From: Dong Aisheng <aisheng.dong@nxp.com>
   3 Date: Mon, 27 May 2019 17:00:54 +0800
   4 Subject: [PATCH] MLK-21876-4 ASoC: fsl: sai: fix build for next-20190524
   5  upgrade
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 In file included from ../sound/soc/fsl/fsl_sai.c:15:0:
  11 ../sound/soc/fsl/fsl_sai.c: In function ‘fsl_sai_startup’:
  12 ../sound/soc/fsl/fsl_sai.c:957:51: error: ‘offset’ undeclared (first use in this function)
  13   regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx, offset),
  14                                                    ^
  15 ../include/linux/regmap.h:77:31: note: in definition of macro ‘regmap_update_bits’
  16   regmap_update_bits_base(map, reg, mask, val, NULL, false, false)
  17                                ^
  18 ../sound/soc/fsl/fsl_sai.h:84:37: note: in expansion of macro ‘FSL_SAI_TCR3’
  19  #define FSL_SAI_xCR3(tx, off) (tx ? FSL_SAI_TCR3(off) : FSL_SAI_RCR3(off))
  20                                      ^
  21 ../sound/soc/fsl/fsl_sai.c:957:34: note: in expansion of macro ‘FSL_SAI_xCR3’
  22   regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx, offset),
  23                                   ^
  24 ../sound/soc/fsl/fsl_sai.c:957:51: note: each undeclared identifier is reported only once for each function it appears in
  25   regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx, offset),
  26                                                    ^
  27 ../include/linux/regmap.h:77:31: note: in definition of macro ‘regmap_update_bits’
  28   regmap_update_bits_base(map, reg, mask, val, NULL, false, false)
  29                                ^
  30 ../sound/soc/fsl/fsl_sai.h:84:37: note: in expansion of macro ‘FSL_SAI_TCR3’
  31  #define FSL_SAI_xCR3(tx, off) (tx ? FSL_SAI_TCR3(off) : FSL_SAI_RCR3(off))
  32                                      ^
  33 ../sound/soc/fsl/fsl_sai.c:957:34: note: in expansion of macro ‘FSL_SAI_xCR3’
  34   regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx, offset),
  35
  36 Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
  37 ---
  38  sound/soc/fsl/fsl_sai.c | 11 +----------
  39  1 file changed, 1 insertion(+), 10 deletions(-)
  40
  41 --- a/sound/soc/fsl/fsl_sai.c
  42 +++ b/sound/soc/fsl/fsl_sai.c
  43 @@ -954,10 +954,6 @@ static int fsl_sai_startup(struct snd_pc
  44         else
  45                 sai->is_stream_opened[tx] = true;
  46
  47 -       regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx, offset),
  48 -                          FSL_SAI_CR3_TRCE_MASK,
  49 -                          FSL_SAI_CR3_TRCE(sai->dataline[tx]));
  50 -
  51         /* EDMA engine needs periods of size multiple of tx/rx maxburst */
  52         if (sai->soc->constrain_period_size)
  53                 snd_pcm_hw_constraint_step(substream->runtime, 0,
  54 @@ -977,13 +973,8 @@ static void fsl_sai_shutdown(struct snd_
  55         struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai);
  56         bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
  57
  58 -       regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx), FSL_SAI_CR3_TRCE, 0);
  59 -
  60 -       if (sai->is_stream_opened[tx]) {
  61 -               regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx, offset),
  62 -                                  FSL_SAI_CR3_TRCE_MASK, 0);
  63 +       if (sai->is_stream_opened[tx])
  64                 sai->is_stream_opened[tx] = false;
  65 -       }
  66  }
  67
  68  static const struct snd_soc_dai_ops fsl_sai_pcm_dai_ops = {