Merge branch 'stable/for-linus-5.2' of git://git.kernel.org/pub/scm/linux/kernel...

[platform/kernel/linux-rpi.git] / sound / soc / fsl / fsl_esai.c

diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
index 3623aa9..bad0dfe 100644 (file)
--- a/sound/soc/fsl/fsl_esai.c
+++ b/sound/soc/fsl/fsl_esai.c
@@ -218,7 +218,7 @@ static int fsl_esai_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
 {
        struct fsl_esai *esai_priv = snd_soc_dai_get_drvdata(dai);
        struct clk *clksrc = esai_priv->extalclk;
-       bool tx = clk_id <= ESAI_HCKT_EXTAL;
+       bool tx = (clk_id <= ESAI_HCKT_EXTAL || esai_priv->synchronous);
        bool in = dir == SND_SOC_CLOCK_IN;
        u32 ratio, ecr = 0;
        unsigned long clk_rate;
@@ -251,9 +251,9 @@ static int fsl_esai_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
                break;
        case ESAI_HCKT_EXTAL:
                ecr |= ESAI_ECR_ETI;
-               /* fall through */
+               break;
        case ESAI_HCKR_EXTAL:
-               ecr |= ESAI_ECR_ERI;
+               ecr |= esai_priv->synchronous ? ESAI_ECR_ETI : ESAI_ECR_ERI;
                break;
        default:
                return -EINVAL;
@@ -537,10 +537,18 @@ static int fsl_esai_hw_params(struct snd_pcm_substream *substream,
 
        bclk = params_rate(params) * slot_width * esai_priv->slots;
 
-       ret = fsl_esai_set_bclk(dai, tx, bclk);
+       ret = fsl_esai_set_bclk(dai, esai_priv->synchronous || tx, bclk);
        if (ret)
                return ret;
 
+       mask = ESAI_xCR_xSWS_MASK;
+       val = ESAI_xCR_xSWS(slot_width, width);
+
+       regmap_update_bits(esai_priv->regmap, REG_ESAI_xCR(tx), mask, val);
+       /* Recording in synchronous mode needs to set TCR also */
+       if (!tx && esai_priv->synchronous)
+               regmap_update_bits(esai_priv->regmap, REG_ESAI_TCR, mask, val);
+
        /* Use Normal mode to support monaural audio */
        regmap_update_bits(esai_priv->regmap, REG_ESAI_xCR(tx),
                           ESAI_xCR_xMOD_MASK, params_channels(params) > 1 ?
@@ -556,10 +564,9 @@ static int fsl_esai_hw_params(struct snd_pcm_substream *substream,
 
        regmap_update_bits(esai_priv->regmap, REG_ESAI_xFCR(tx), mask, val);
 
-       mask = ESAI_xCR_xSWS_MASK | (tx ? ESAI_xCR_PADC : 0);
-       val = ESAI_xCR_xSWS(slot_width, width) | (tx ? ESAI_xCR_PADC : 0);
-
-       regmap_update_bits(esai_priv->regmap, REG_ESAI_xCR(tx), mask, val);
+       if (tx)
+               regmap_update_bits(esai_priv->regmap, REG_ESAI_TCR,
+                               ESAI_xCR_PADC, ESAI_xCR_PADC);
 
        /* Remove ESAI personal reset by configuring ESAI_PCRC and ESAI_PRRC */
        regmap_update_bits(esai_priv->regmap, REG_ESAI_PRRC,