ASoC: tlv320aic3x: Optimize PLL programming in aic3x_set_bias_level

There is only need to enable/disable once the PLL when the bias is going
between on, prepare, standby and off states.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index b3175860bcb4c23959f586eeef33674d40f2e341..94dc707d90227dce084584e5b6dc500b8a07e7c6 100644 (file)
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1069,7 +1069,8 @@ static int aic3x_set_bias_level(struct snd_soc_codec *codec,
        case SND_SOC_BIAS_ON:
                break;
        case SND_SOC_BIAS_PREPARE:
-               if (aic3x->master) {
+               if (codec->bias_level == SND_SOC_BIAS_STANDBY &&
+                   aic3x->master) {
                        /* enable pll */
                        reg = aic3x_read_reg_cache(codec, AIC3X_PLL_PROGA_REG);
                        aic3x_write(codec, AIC3X_PLL_PROGA_REG,
@@ -1077,15 +1078,16 @@ static int aic3x_set_bias_level(struct snd_soc_codec *codec,
                }
                break;
        case SND_SOC_BIAS_STANDBY:
-               /* fall through and disable pll */
-       case SND_SOC_BIAS_OFF:
-               if (aic3x->master) {
+               if (codec->bias_level == SND_SOC_BIAS_PREPARE &&
+                   aic3x->master) {
                        /* disable pll */
                        reg = aic3x_read_reg_cache(codec, AIC3X_PLL_PROGA_REG);
                        aic3x_write(codec, AIC3X_PLL_PROGA_REG,
                                    reg & ~PLL_ENABLE);
                }
                break;
+       case SND_SOC_BIAS_OFF:
+               break;
        }
        codec->bias_level = level;