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

Commit 74cdab45 authored by David Keitel's avatar David Keitel
Browse files

power: qpnp-charger: fix ULPM address for SMBCL and SMBBP 



The SMBCL and SMBBP BATFET_CTRL registers are at a different
location than the one for SMBB.

Fix this by using the correct register offset for the ULPM
batfet regulator.

CRs-Fixed: 539624
Change-Id: Ie7802901cc683259e8b545d244c0d7f580074091
Signed-off-by: default avatarDavid Keitel <dkeitel@codeaurora.org>
parent 86155e46

drivers/power/qpnp-charger.c

+19 −4
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ 
#define CHGR_STATUS				0x09

#define CHGR_BAT_IF_VCP				0x42

#define CHGR_BAT_IF_BATFET_CTRL1		0x90

#define CHGR_BAT_IF_BATFET_CTRL4		0x93

#define CHGR_BAT_IF_SPARE			0xDF

#define CHGR_MISC_BOOT_DONE			0x42

#define CHGR_BUCK_PSTG_CTRL			0x73
@@ -2360,9 +2361,14 @@ qpnp_chg_regulator_batfet_enable(struct regulator_dev *rdev) 
	struct qpnp_chg_chip *chip = rdev_get_drvdata(rdev);

	int rc;



	if (chip->type == SMBB)

		rc = qpnp_chg_masked_write(chip,

			chip->bat_if_base + CHGR_BAT_IF_SPARE,

			BATFET_LPM_MASK, BATFET_NO_LPM, 1);

	else

		rc = qpnp_chg_masked_write(chip,

			chip->bat_if_base + CHGR_BAT_IF_BATFET_CTRL4,

			BATFET_LPM_MASK, BATFET_NO_LPM, 1);

	if (rc)

		pr_err("failed to write to batt_if rc=%d\n", rc);

	return rc;
@@ -2374,9 +2380,14 @@ qpnp_chg_regulator_batfet_disable(struct regulator_dev *rdev) 
	struct qpnp_chg_chip *chip = rdev_get_drvdata(rdev);

	int rc;



	if (chip->type == SMBB)

		rc = qpnp_chg_masked_write(chip,

			chip->bat_if_base + CHGR_BAT_IF_SPARE,

			BATFET_LPM_MASK, BATFET_LPM, 1);

	else

		rc = qpnp_chg_masked_write(chip,

			chip->bat_if_base + CHGR_BAT_IF_BATFET_CTRL4,

			BATFET_LPM_MASK, BATFET_LPM, 1);

	if (rc)

		pr_err("failed to write to batt_if rc=%d\n", rc);

	return rc;
@@ -2386,11 +2397,15 @@ static int 
qpnp_chg_regulator_batfet_is_enabled(struct regulator_dev *rdev)

{

	struct qpnp_chg_chip *chip = rdev_get_drvdata(rdev);

	int rc;

	int rc = 0;

	u8 reg;



	if (chip->type == SMBB)

		rc = qpnp_chg_read(chip, &reg,

				chip->bat_if_base + CHGR_BAT_IF_SPARE, 1);

	else

		rc = qpnp_chg_read(chip, &reg,

			chip->bat_if_base + CHGR_BAT_IF_BATFET_CTRL4, 1);

	if (rc) {

		pr_err("failed to read batt_if rc=%d\n", rc);

		return rc;