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

Commit 5920704a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: qpnp-charger: fix charging timer"

parents 6271307f cb7b91be

drivers/power/qpnp-charger.c

+27 −3
Original line number Diff line number Diff line
@@ -72,8 +72,9 @@ 
#define CHGR_IBAT_TERM_CHGR			0x5B

#define CHGR_IBAT_TERM_BMS			0x5C

#define CHGR_VBAT_DET				0x5D

#define CHGR_TTRKL_MAX_EN			0x5E

#define CHGR_TTRKL_MAX				0x5F

#define CHGR_TTRKL_MAX_EN			0x60

#define CHGR_TCHG_MAX_EN			0x60

#define CHGR_TCHG_MAX				0x61

#define CHGR_CHG_WDOG_TIME			0x62

#define CHGR_CHG_WDOG_DLY			0x63
@@ -2456,21 +2457,44 @@ qpnp_chg_ibatmax_get(struct qpnp_chg_chip *chip, int *chg_current) 
}



#define QPNP_CHG_TCHG_MASK	0x7F

#define QPNP_CHG_TCHG_EN_MASK	0x80

#define QPNP_CHG_TCHG_MIN	4

#define QPNP_CHG_TCHG_MAX	512

#define QPNP_CHG_TCHG_STEP	4

static int qpnp_chg_tchg_max_set(struct qpnp_chg_chip *chip, int minutes)

{

	u8 temp;

	int rc;



	if (minutes < QPNP_CHG_TCHG_MIN || minutes > QPNP_CHG_TCHG_MAX) {

		pr_err("bad max minutes =%d asked to set\n", minutes);

		return -EINVAL;

	}



	temp = (minutes - 1)/QPNP_CHG_TCHG_STEP;

	return qpnp_chg_masked_write(chip, chip->chgr_base + CHGR_TCHG_MAX,

	rc = qpnp_chg_masked_write(chip, chip->chgr_base + CHGR_TCHG_MAX_EN,

			QPNP_CHG_TCHG_EN_MASK, 0, 1);

	if (rc) {

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

		return rc;

	}



	temp = minutes / QPNP_CHG_TCHG_STEP - 1;



	rc = qpnp_chg_masked_write(chip, chip->chgr_base + CHGR_TCHG_MAX,

			QPNP_CHG_TCHG_MASK, temp, 1);

	if (rc) {

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

		return rc;

	}



	rc = qpnp_chg_masked_write(chip, chip->chgr_base + CHGR_TCHG_MAX_EN,

			QPNP_CHG_TCHG_EN_MASK, QPNP_CHG_TCHG_EN_MASK, 1);

	if (rc) {

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

		return rc;

	}



	return 0;

}



static int