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

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

Merge "qpnp-smb2: fix FV and FCC reporting"

parents 22efbfc1 33d18463

drivers/power/supply/qcom/qpnp-smb2.c

+3 −2
Original line number Diff line number Diff line
@@ -1047,7 +1047,8 @@ static int smb2_batt_get_prop(struct power_supply *psy, 
		rc = smblib_get_prop_batt_voltage_now(chg, val);

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_MAX:

		val->intval = get_client_vote(chg->fv_votable, DEFAULT_VOTER);

		val->intval = get_client_vote(chg->fv_votable,

				BATT_PROFILE_VOTER);

		break;

	case POWER_SUPPLY_PROP_CHARGE_QNOVO_ENABLE:

		rc = smblib_get_prop_charge_qnovo_enable(chg, val);
@@ -1065,7 +1066,7 @@ static int smb2_batt_get_prop(struct power_supply *psy, 
		break;

	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:

		val->intval = get_client_vote(chg->fcc_votable,

					      DEFAULT_VOTER);

					      BATT_PROFILE_VOTER);

		break;

	case POWER_SUPPLY_PROP_TEMP:

		rc = smblib_get_prop_batt_temp(chg, val);

drivers/power/supply/qcom/smb-lib.c

+5 −3
Original line number Diff line number Diff line
@@ -1611,6 +1611,7 @@ int smblib_get_prop_batt_health(struct smb_charger *chg, 
{

	union power_supply_propval pval;

	int rc;

	int effective_fv_uv;

	u8 stat;



	rc = smblib_read(chg, BATTERY_CHARGER_STATUS_2_REG, &stat);
@@ -1629,10 +1630,11 @@ int smblib_get_prop_batt_health(struct smb_charger *chg, 
			 * If Vbatt is within 40mV above Vfloat, then don't

			 * treat it as overvoltage.

			 */

			if (pval.intval >=

				get_effective_result(chg->fv_votable) + 40000) {

			effective_fv_uv = get_effective_result(chg->fv_votable);

			if (pval.intval >= effective_fv_uv + 40000) {

				val->intval = POWER_SUPPLY_HEALTH_OVERVOLTAGE;

				smblib_err(chg, "battery over-voltage\n");

				smblib_err(chg, "battery over-voltage vbat_fg = %duV, fv = %duV\n",

						pval.intval, effective_fv_uv);

				goto done;

			}

		}