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

   1 From cf07127ea019b78f7ea5e009d494e2bd0bd475fa Mon Sep 17 00:00:00 2001
   2 From: Leonard Crestez <leonard.crestez@nxp.com>
   3 Date: Thu, 3 Oct 2019 20:44:56 +0300
   4 Subject: [PATCH] Revert "ASoC: fsl_sai: Fix noise when using EDMA"
   5
   6 This reverts commit e75f4940e8ad0dd76527302a10c06b58bf7eb590.
   7 ---
   8  sound/soc/fsl/fsl_sai.c | 15 ---------------
   9  sound/soc/fsl/fsl_sai.h |  1 -
  10  2 files changed, 16 deletions(-)
  11
  12 --- a/sound/soc/fsl/fsl_sai.c
  13 +++ b/sound/soc/fsl/fsl_sai.c
  14 @@ -628,16 +628,6 @@ static int fsl_sai_startup(struct snd_pc
  15                            FSL_SAI_CR3_TRCE_MASK,
  16                            FSL_SAI_CR3_TRCE);
  17
  18 -       /*
  19 -        * EDMA controller needs period size to be a multiple of
  20 -        * tx/rx maxburst
  21 -        */
  22 -       if (sai->soc_data->use_edma)
  23 -               snd_pcm_hw_constraint_step(substream->runtime, 0,
  24 -                                          SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
  25 -                                          tx ? sai->dma_params_tx.maxburst :
  26 -                                          sai->dma_params_rx.maxburst);
  27 -
  28         ret = snd_pcm_hw_constraint_list(substream->runtime, 0,
  29                         SNDRV_PCM_HW_PARAM_RATE, &fsl_sai_rate_constraints);
  30
  31 @@ -1048,35 +1038,30 @@ static int fsl_sai_remove(struct platfor
  32
  33  static const struct fsl_sai_soc_data fsl_sai_vf610_data = {
  34         .use_imx_pcm = false,
  35 -       .use_edma = false,
  36         .fifo_depth = 32,
  37         .reg_offset = 0,
  38  };
  39
  40  static const struct fsl_sai_soc_data fsl_sai_imx6sx_data = {
  41         .use_imx_pcm = true,
  42 -       .use_edma = false,
  43         .fifo_depth = 32,
  44         .reg_offset = 0,
  45  };
  46
  47  static const struct fsl_sai_soc_data fsl_sai_imx7ulp_data = {
  48         .use_imx_pcm = true,
  49 -       .use_edma = false,
  50         .fifo_depth = 16,
  51         .reg_offset = 8,
  52  };
  53
  54  static const struct fsl_sai_soc_data fsl_sai_imx8mq_data = {
  55         .use_imx_pcm = true,
  56 -       .use_edma = false,
  57         .fifo_depth = 128,
  58         .reg_offset = 8,
  59  };
  60
  61  static const struct fsl_sai_soc_data fsl_sai_imx8qm_data = {
  62         .use_imx_pcm = true,
  63 -       .use_edma = true,
  64         .fifo_depth = 64,
  65         .reg_offset = 0,
  66  };
  67 --- a/sound/soc/fsl/fsl_sai.h
  68 +++ b/sound/soc/fsl/fsl_sai.h
  69 @@ -157,7 +157,6 @@
  70
  71  struct fsl_sai_soc_data {
  72         bool use_imx_pcm;
  73 -       bool use_edma;
  74         unsigned int fifo_depth;
  75         unsigned int reg_offset;
  76  };