diff options
| author |   Nicolin Chen <Guangyu.Chen@freescale.com> | 2014-05-06 16:56:00 +0800 |
|---|---|---|
| committer |   Mark Brown <broonie@linaro.org> | 2014-05-12 23:13:13 +0100 |
| commit | 57ebbcafab0ce8cce4493c6a243ecdd7066e6ef1 (patch) | |
| tree | f1c3fc761b5e43b85d319f580f9f04991125154d /sound | |
| parent | ASoC: fsl_esai: Fix incorrect condition within ratio range check for FP (diff) | |
| download | linux-dev-57ebbcafab0ce8cce4493c6a243ecdd7066e6ef1.tar.xz linux-dev-57ebbcafab0ce8cce4493c6a243ecdd7066e6ef1.zip | |
ASoC: fsl_esai: Only bypass sck_div for EXTAL source
ESAI can only output EXTAL clock source directly. But for FSYS clock source,
ESAI can not output it without getting through PSR PM dividers.
So this patch adds an extra check in the code.
Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/fsl/fsl_esai.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index 35c0b9295a80..c674fd99158b 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -258,10 +258,16 @@ static int fsl_esai_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id, return -EINVAL; } - if (ratio == 1) { + /* Only EXTAL source can be output directly without using PSR and PM */ + if (ratio == 1 && clksrc == esai_priv->extalclk) { /* Bypass all the dividers if not being needed */ ecr |= tx ? ESAI_ECR_ETO : ESAI_ECR_ERO; goto out; + } else if (ratio < 2) { + /* The ratio should be no less than 2 if using other sources */ + dev_err(dai->dev, "failed to derive required HCK%c rate\n", + tx ? 'T' : 'R'); + return -EINVAL; } ret = fsl_esai_divisor_cal(dai, tx, ratio, false, 0); |