Merge tag 'v5.10.35' into lf-5.10.y
authorJason Liu <jason.hui.liu@nxp.com>
Fri, 7 May 2021 09:45:32 +0000 (17:45 +0800)
committerJason Liu <jason.hui.liu@nxp.com>
Fri, 7 May 2021 09:45:32 +0000 (17:45 +0800)
This is the 5.10.35 stable release

* tag 'v5.10.35': (174 commits)
  Linux 5.10.35
  vfio: Depend on MMU
  perf/core: Fix unconditional security_locked_down() call
  ...

Signed-off-by: Jason Liu <jason.hui.liu@nxp.com>
1  2 
arch/arm64/Kconfig
sound/soc/fsl/fsl_esai.c

Simple merge
@@@ -498,21 -524,15 +498,23 @@@ static int fsl_esai_startup(struct snd_
                                   ESAI_SAICR_SYNC, esai_priv->synchronous ?
                                   ESAI_SAICR_SYNC : 0);
  
-               /* Set a default slot number -- 2 */
+               /* Set slots count */
                regmap_update_bits(esai_priv->regmap, REG_ESAI_TCCR,
-                                  ESAI_xCCR_xDC_MASK, ESAI_xCCR_xDC(2));
+                                  ESAI_xCCR_xDC_MASK,
+                                  ESAI_xCCR_xDC(esai_priv->slots));
                regmap_update_bits(esai_priv->regmap, REG_ESAI_RCCR,
-                                  ESAI_xCCR_xDC_MASK, ESAI_xCCR_xDC(2));
+                                  ESAI_xCCR_xDC_MASK,
+                                  ESAI_xCCR_xDC(esai_priv->slots));
        }
  
 +      if (esai_priv->soc->use_edma)
 +              snd_pcm_hw_constraint_step(substream->runtime, 0,
 +                                         SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
 +                                         tx ? esai_priv->dma_params_tx.maxburst :
 +                                         esai_priv->dma_params_rx.maxburst);
 +      if (esai_priv->sw_mix)
 +              fsl_esai_mix_open(substream, &esai_priv->mix[tx]);
 +
        return 0;
  
  }