Merge "power: qpnp-linear-charger: Allow to disable safety-timer" (ce2d9f99) · Commits · e / devices / android_kernel_sony_msm8994

drivers/power/qpnp-linear-charger.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -934,8 +934,6 @@ static int qpnp_lbc_tchg_max_set(struct qpnp_lbc_chip *chip, int minutes)
		u8 reg_val = 0;
		int rc;

		minutes = clamp(minutes, QPNP_LBC_TCHG_MIN, QPNP_LBC_TCHG_MAX);

		/* Disable timer */
		rc = qpnp_lbc_masked_write(chip, chip->chgr_base + CHG_TCHG_MAX_EN_REG,
		CHG_TCHG_MAX_EN_BIT, 0);
		@@ -944,6 +942,14 @@ static int qpnp_lbc_tchg_max_set(struct qpnp_lbc_chip *chip, int minutes)
		return rc;
		}

		/* If minutes is 0, just disable timer */
		if (!minutes) {
		pr_debug("Charger safety timer disabled\n");
		return rc;
		}

		minutes = clamp(minutes, QPNP_LBC_TCHG_MIN, QPNP_LBC_TCHG_MAX);

		reg_val = (minutes / QPNP_LBC_TCHG_STEP) - 1;

		pr_debug("TCHG_MAX=%d mins setting %x\n", minutes, reg_val);