Commit db13802e authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Liam Girdwood

ASoC: tlv320aic3x: Change bias management semantics

Move PLL enable from BIAS_ON state to BIAS_PREPARE to be pair with
BIAS_STANDBY where PLL is disabled. Remove also old comments about power
control.
Signed-off-by: default avatarJarkko Nikula <jhnikula@gmail.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent d3235c4a
...@@ -997,7 +997,8 @@ static int aic3x_set_bias_level(struct snd_soc_codec *codec, ...@@ -997,7 +997,8 @@ static int aic3x_set_bias_level(struct snd_soc_codec *codec,
switch (level) { switch (level) {
case SND_SOC_BIAS_ON: case SND_SOC_BIAS_ON:
/* all power is driven by DAPM system */ break;
case SND_SOC_BIAS_PREPARE:
if (aic3x->master) { if (aic3x->master) {
/* enable pll */ /* enable pll */
reg = aic3x_read_reg_cache(codec, AIC3X_PLL_PROGA_REG); reg = aic3x_read_reg_cache(codec, AIC3X_PLL_PROGA_REG);
...@@ -1005,13 +1006,8 @@ static int aic3x_set_bias_level(struct snd_soc_codec *codec, ...@@ -1005,13 +1006,8 @@ static int aic3x_set_bias_level(struct snd_soc_codec *codec,
reg | PLL_ENABLE); reg | PLL_ENABLE);
} }
break; break;
case SND_SOC_BIAS_PREPARE:
break;
case SND_SOC_BIAS_STANDBY: case SND_SOC_BIAS_STANDBY:
/* /* fall through and disable pll */
* all power is driven by DAPM system,
* so output power is safe if bypass was set
*/
case SND_SOC_BIAS_OFF: case SND_SOC_BIAS_OFF:
if (aic3x->master) { if (aic3x->master) {
/* disable pll */ /* disable pll */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment