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

   1 From 33c1f03b9eca0c192708c9df295d2a30073cd121 Mon Sep 17 00:00:00 2001
   2 From: Dong Aisheng <aisheng.dong@nxp.com>
   3 Date: Wed, 31 Jul 2019 17:11:32 +0800
   4 Subject: [PATCH] Revert "ASoC: fsl_sai: derive TX FIFO watermark from FIFO
   5  depth"
   6
   7 This reverts commit bd517707d85f19a7339ea8b882fcbf0fd9976bd6.
   8 ---
   9  sound/soc/fsl/fsl_sai.c | 4 +---
  10  sound/soc/fsl/fsl_sai.h | 1 -
  11  2 files changed, 1 insertion(+), 4 deletions(-)
  12
  13 --- a/sound/soc/fsl/fsl_sai.c
  14 +++ b/sound/soc/fsl/fsl_sai.c
  15 @@ -640,7 +640,7 @@ static int fsl_sai_dai_probe(struct snd_
  16         regmap_write(sai->regmap, FSL_SAI_RCSR, 0);
  17
  18         regmap_update_bits(sai->regmap, FSL_SAI_TCR1, FSL_SAI_CR1_RFW_MASK,
  19 -                          sai->soc_data->fifo_depth - FSL_SAI_MAXBURST_TX);
  20 +                          FSL_SAI_MAXBURST_TX * 2);
  21         regmap_update_bits(sai->regmap, FSL_SAI_RCR1, FSL_SAI_CR1_RFW_MASK,
  22                            FSL_SAI_MAXBURST_RX - 1);
  23
  24 @@ -928,12 +928,10 @@ static int fsl_sai_remove(struct platfor
  25
  26  static const struct fsl_sai_soc_data fsl_sai_vf610_data = {
  27         .use_imx_pcm = false,
  28 -       .fifo_depth = 32,
  29  };
  30
  31  static const struct fsl_sai_soc_data fsl_sai_imx6sx_data = {
  32         .use_imx_pcm = true,
  33 -       .fifo_depth = 32,
  34  };
  35
  36  static const struct of_device_id fsl_sai_ids[] = {
  37 --- a/sound/soc/fsl/fsl_sai.h
  38 +++ b/sound/soc/fsl/fsl_sai.h
  39 @@ -128,7 +128,6 @@
  40
  41  struct fsl_sai_soc_data {
  42         bool use_imx_pcm;
  43 -       unsigned int fifo_depth;
  44  };
  45
  46  struct fsl_sai {