]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: da7213: Allow PLL disable/bypass when using 32KHz sysclk
authorAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Tue, 10 May 2016 15:11:08 +0000 (16:11 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 10 May 2016 18:24:19 +0000 (19:24 +0100)
Current checking for PLL 32KHz mode fails in driver code when
bypassing the PLL. This is due to an incorrect check of PLL
source type when 32KHz clock is provided. Removal of this check
resolves the issue.

Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/da7213.c

index a233fe7f12ebc8077b79605b3a25ddd5cfe9db33..e5527bc570ae550394807f8062092af3e8f0a6e1 100644 (file)
@@ -1342,7 +1342,7 @@ static int da7213_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
        pll_ctrl = 0;
 
        /* Workout input divider based on MCLK rate */
-       if ((da7213->mclk_rate == 32768) && (source == DA7213_SYSCLK_PLL)) {
+       if (da7213->mclk_rate == 32768) {
                /* 32KHz PLL Mode */
                indiv_bits = DA7213_PLL_INDIV_9_TO_18_MHZ;
                indiv = DA7213_PLL_INDIV_9_TO_18_MHZ_VAL;