target/linux/layerscape/patches-5.4/801-audio-0034-MLK-13946-8-ASoC-fsl_sai-use-min-channels-slots-for-.patch

   1 From 283d3a9e253d2cefd915ee7f891c24edc3e6d6d0 Mon Sep 17 00:00:00 2001
   2 From: Viorel Suman <viorel.suman@nxp.com>
   3 Date: Tue, 24 Oct 2017 13:09:27 +0300
   4 Subject: [PATCH] MLK-13946-8: ASoC: fsl_sai: use min(channels,slots) for xMR
   5  setting
   6
   7 xMR setting must be set as min(channels,slots) since
   8 both "channels < slots" and "channels > slots" scenarios
   9 are possible.
  10
  11 Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
  12 ---
  13  sound/soc/fsl/fsl_sai.c | 4 ++--
  14  1 file changed, 2 insertions(+), 2 deletions(-)
  15
  16 --- a/sound/soc/fsl/fsl_sai.c
  17 +++ b/sound/soc/fsl/fsl_sai.c
  18 @@ -571,8 +571,8 @@ static int fsl_sai_hw_params(struct snd_
  19         regmap_update_bits(sai->regmap, FSL_SAI_xCR5(tx, offset),
  20                            FSL_SAI_CR5_WNW_MASK | FSL_SAI_CR5_W0W_MASK |
  21                            FSL_SAI_CR5_FBT_MASK, val_cr5);
  22 -       regmap_write(sai->regmap, FSL_SAI_xMR(tx), ~0UL - ((1 << slots) - 1));
  23 -
  24 +       regmap_write(sai->regmap, FSL_SAI_xMR(tx),
  25 +                       ~0UL - ((1 << min(channels, slots)) - 1));
  26         return 0;
  27  }
  28