Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3235c4a authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Liam Girdwood
Browse files

ASoC: tlv320aic3x: Remove needless power off from aic3x_set_bias_level 



These ADC, DAC and output pin power off commands are needless in
aic3x_set_bias_level since they are not enabled in aic3x_init and they are
defined in aic3x_dapm_widgets so the ASoC DAPM will take care of them
anyway.

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 c6de6e03

sound/soc/codecs/tlv320aic3x.c

+0 −34
Original line number Diff line number Diff line
@@ -1012,41 +1012,7 @@ static int aic3x_set_bias_level(struct snd_soc_codec *codec, 
		 * all power is driven by DAPM system,

		 * so output power is safe if bypass was set

		 */

		if (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:

		/* force all power off */

		reg = aic3x_read_reg_cache(codec, LINE1L_2_LADC_CTRL);

		aic3x_write(codec, LINE1L_2_LADC_CTRL, reg & ~LADC_PWR_ON);

		reg = aic3x_read_reg_cache(codec, LINE1R_2_RADC_CTRL);

		aic3x_write(codec, LINE1R_2_RADC_CTRL, reg & ~RADC_PWR_ON);



		reg = aic3x_read_reg_cache(codec, DAC_PWR);

		aic3x_write(codec, DAC_PWR, reg & ~(LDAC_PWR_ON | RDAC_PWR_ON));



		reg = aic3x_read_reg_cache(codec, HPLOUT_CTRL);

		aic3x_write(codec, HPLOUT_CTRL, reg & ~HPLOUT_PWR_ON);

		reg = aic3x_read_reg_cache(codec, HPROUT_CTRL);

		aic3x_write(codec, HPROUT_CTRL, reg & ~HPROUT_PWR_ON);



		reg = aic3x_read_reg_cache(codec, HPLCOM_CTRL);

		aic3x_write(codec, HPLCOM_CTRL, reg & ~HPLCOM_PWR_ON);

		reg = aic3x_read_reg_cache(codec, HPRCOM_CTRL);

		aic3x_write(codec, HPRCOM_CTRL, reg & ~HPRCOM_PWR_ON);



		reg = aic3x_read_reg_cache(codec, MONOLOPM_CTRL);

		aic3x_write(codec, MONOLOPM_CTRL, reg & ~MONOLOPM_PWR_ON);



		reg = aic3x_read_reg_cache(codec, LLOPM_CTRL);

		aic3x_write(codec, LLOPM_CTRL, reg & ~LLOPM_PWR_ON);

		reg = aic3x_read_reg_cache(codec, RLOPM_CTRL);

		aic3x_write(codec, RLOPM_CTRL, reg & ~RLOPM_PWR_ON);



		if (aic3x->master) {

			/* disable pll */

			reg = aic3x_read_reg_cache(codec, AIC3X_PLL_PROGA_REG);