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

Commit e3e9ab6b 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 vin_min for values > 5.6V"

parents ef51be93 e8d5769e

drivers/power/qpnp-charger.c

+2 −2
Original line number Diff line number Diff line
@@ -899,7 +899,7 @@ qpnp_chg_vinmin_set(struct qpnp_chg_chip *chip, int voltage) 
	}

	if (voltage >= QPNP_CHG_VINMIN_HIGH_MIN_MV) {

		temp = QPNP_CHG_VINMIN_HIGH_MIN_VAL;

		temp += (voltage - QPNP_CHG_VINMIN_MIN_MV)

		temp += (voltage - QPNP_CHG_VINMIN_HIGH_MIN_MV)

			/ QPNP_CHG_VINMIN_STEP_HIGH_MV;

	} else {

		temp = QPNP_CHG_VINMIN_MIN_VAL;
@@ -927,7 +927,7 @@ qpnp_chg_vinmin_get(struct qpnp_chg_chip *chip) 


	if (vin_min == 0)

		vin_min_mv = QPNP_CHG_I_MAX_MIN_100;

	else if (vin_min > QPNP_CHG_VINMIN_HIGH_MIN_VAL)

	else if (vin_min >= QPNP_CHG_VINMIN_HIGH_MIN_VAL)

		vin_min_mv = QPNP_CHG_VINMIN_HIGH_MIN_MV +

			(vin_min - QPNP_CHG_VINMIN_HIGH_MIN_VAL)

				* QPNP_CHG_VINMIN_STEP_HIGH_MV;