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

Commit 30590d04 authored by Laxman Dewangan's avatar Laxman Dewangan Committed by Mark Brown
Browse files

regulator: palmas: clear sleep bits if not selected 



Clear the sleep/warm reset bits when it is not selected through
regulator platform data. This will make sure that configuration
is inline with the platform data regardless of boot/POR
configuration.

Signed-off-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Acked-by: default avatarGraeme Gregory <gg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 504382c9

drivers/regulator/palmas-regulator.c

+12 −6
Original line number Diff line number Diff line
@@ -443,25 +443,27 @@ static int palmas_smps_init(struct palmas *palmas, int id, 


	switch (id) {

	case PALMAS_REG_SMPS10:

		if (reg_init->mode_sleep) {

		reg &= ~PALMAS_SMPS10_CTRL_MODE_SLEEP_MASK;

		if (reg_init->mode_sleep)

			reg |= reg_init->mode_sleep <<

					PALMAS_SMPS10_CTRL_MODE_SLEEP_SHIFT;

		}

		break;

	default:

		if (reg_init->warm_reset)

			reg |= PALMAS_SMPS12_CTRL_WR_S;

		else

			reg &= ~PALMAS_SMPS12_CTRL_WR_S;



		if (reg_init->roof_floor)

			reg |= PALMAS_SMPS12_CTRL_ROOF_FLOOR_EN;

		else

			reg &= ~PALMAS_SMPS12_CTRL_ROOF_FLOOR_EN;



		if (reg_init->mode_sleep) {

		reg &= ~PALMAS_SMPS12_CTRL_MODE_SLEEP_MASK;

		if (reg_init->mode_sleep)

			reg |= reg_init->mode_sleep <<

					PALMAS_SMPS12_CTRL_MODE_SLEEP_SHIFT;

	}

	}



	ret = palmas_smps_write(palmas, addr, reg);

	if (ret)
@@ -506,9 +508,13 @@ static int palmas_ldo_init(struct palmas *palmas, int id, 


	if (reg_init->warm_reset)

		reg |= PALMAS_LDO1_CTRL_WR_S;

	else

		reg &= ~PALMAS_LDO1_CTRL_WR_S;



	if (reg_init->mode_sleep)

		reg |= PALMAS_LDO1_CTRL_MODE_SLEEP;

	else

		reg &= ~PALMAS_LDO1_CTRL_MODE_SLEEP;



	ret = palmas_ldo_write(palmas, addr, reg);

	if (ret)