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

Commit a68de074 authored by Graeme Gregory's avatar Graeme Gregory Committed by Mark Brown
Browse files

regulator: palmas: fix regmap offsets for enable/disable 



I forgot to apply the offsets for the regmap helper functions for
enable/disable on SMPS10 and the LDO regulators. This means regulators
will not enable/disable correctly.

Signed-off-by: default avatarGraeme Gregory <gg@slimlogic.co.uk>
Tested-by: default avatarSebastien Guiriec <s-guiriec@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 8386a00f

drivers/regulator/palmas-regulator.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -673,7 +673,9 @@ static __devinit int palmas_probe(struct platform_device *pdev) 
			pmic->desc[id].ops = &palmas_ops_smps10;

			pmic->desc[id].ops = &palmas_ops_smps10;

			pmic->desc[id].vsel_reg = PALMAS_SMPS10_CTRL;

			pmic->desc[id].vsel_reg = PALMAS_SMPS10_CTRL;

			pmic->desc[id].vsel_mask = SMPS10_VSEL;

			pmic->desc[id].vsel_mask = SMPS10_VSEL;

			pmic->desc[id].enable_reg = PALMAS_SMPS10_STATUS;

			pmic->desc[id].enable_reg =

					PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,

							PALMAS_SMPS10_STATUS);

			pmic->desc[id].enable_mask = SMPS10_BOOST_EN;

			pmic->desc[id].enable_mask = SMPS10_BOOST_EN;

		}

		}
@@ -739,7 +741,8 @@ static __devinit int palmas_probe(struct platform_device *pdev) 




		pmic->desc[id].type = REGULATOR_VOLTAGE;

		pmic->desc[id].type = REGULATOR_VOLTAGE;

		pmic->desc[id].owner = THIS_MODULE;

		pmic->desc[id].owner = THIS_MODULE;

		pmic->desc[id].enable_reg = palmas_regs_info[id].ctrl_addr;

		pmic->desc[id].enable_reg = PALMAS_BASE_TO_REG(PALMAS_LDO_BASE,

						palmas_regs_info[id].ctrl_addr);

		pmic->desc[id].enable_mask = PALMAS_LDO1_CTRL_MODE_ACTIVE;

		pmic->desc[id].enable_mask = PALMAS_LDO1_CTRL_MODE_ACTIVE;





		if (pdata && pdata->reg_data)

		if (pdata && pdata->reg_data)