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

Commit 10245922 authored by Andreas Kemnade's avatar Andreas Kemnade Committed by Greg Kroah-Hartman
Browse files

regulator: twl6030: fix get status of twl6032 regulators 



[ Upstream commit 31a6297b89aabc81b274c093a308a7f5b55081a7 ]

Status is reported as always off in the 6032 case. Status
reporting now matches the logic in the setters. Once of
the differences to the 6030 is that there are no groups,
therefore the state needs to be read out in the lower bits.

Signed-off-by: default avatarAndreas Kemnade <andreas@kemnade.info>
Link: https://lore.kernel.org/r/20221120221208.3093727-3-andreas@kemnade.info


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f2ba66d8

drivers/regulator/twl6030-regulator.c

+11 −4
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ struct twlreg_info { 
#define TWL6030_CFG_STATE_SLEEP	0x03

#define TWL6030_CFG_STATE_GRP_SHIFT	5

#define TWL6030_CFG_STATE_APP_SHIFT	2

#define TWL6030_CFG_STATE_MASK		0x03

#define TWL6030_CFG_STATE_APP_MASK	(0x03 << TWL6030_CFG_STATE_APP_SHIFT)

#define TWL6030_CFG_STATE_APP(v)	(((v) & TWL6030_CFG_STATE_APP_MASK) >>\

						TWL6030_CFG_STATE_APP_SHIFT)
@@ -128,13 +129,14 @@ static int twl6030reg_is_enabled(struct regulator_dev *rdev) 
		if (grp < 0)

			return grp;

		grp &= P1_GRP_6030;

		val = twlreg_read(info, TWL_MODULE_PM_RECEIVER, VREG_STATE);

		val = TWL6030_CFG_STATE_APP(val);

	} else {

		val = twlreg_read(info, TWL_MODULE_PM_RECEIVER, VREG_STATE);

		val &= TWL6030_CFG_STATE_MASK;

		grp = 1;

	}



	val = twlreg_read(info, TWL_MODULE_PM_RECEIVER, VREG_STATE);

	val = TWL6030_CFG_STATE_APP(val);



	return grp && (val == TWL6030_CFG_STATE_ON);

}
@@ -187,7 +189,12 @@ static int twl6030reg_get_status(struct regulator_dev *rdev) 


	val = twlreg_read(info, TWL_MODULE_PM_RECEIVER, VREG_STATE);



	switch (TWL6030_CFG_STATE_APP(val)) {

	if (info->features & TWL6032_SUBCLASS)

		val &= TWL6030_CFG_STATE_MASK;

	else

		val = TWL6030_CFG_STATE_APP(val);



	switch (val) {

	case TWL6030_CFG_STATE_ON:

		return REGULATOR_STATUS_NORMAL;