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

Commit 6f2ab7d1 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-smb2: Add support for reducing FCC for ESR"

parents 111af389 af0a1bf9

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

+11 −0
Original line number Diff line number Diff line
@@ -985,6 +985,7 @@ static enum power_supply_property smb2_batt_props[] = { 
	POWER_SUPPLY_PROP_CURRENT_NOW,

	POWER_SUPPLY_PROP_CURRENT_QNOVO,

	POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX,

	POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT,

	POWER_SUPPLY_PROP_TEMP,

	POWER_SUPPLY_PROP_TECHNOLOGY,

	POWER_SUPPLY_PROP_STEP_CHARGING_ENABLED,
@@ -1076,6 +1077,10 @@ static int smb2_batt_get_prop(struct power_supply *psy, 
		val->intval = get_client_vote(chg->fcc_votable,

					      BATT_PROFILE_VOTER);

		break;

	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:

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

					      FG_ESR_VOTER);

		break;

	case POWER_SUPPLY_PROP_TECHNOLOGY:

		val->intval = POWER_SUPPLY_TECHNOLOGY_LION;

		break;
@@ -1183,6 +1188,12 @@ static int smb2_batt_set_prop(struct power_supply *psy, 
		chg->batt_profile_fcc_ua = val->intval;

		vote(chg->fcc_votable, BATT_PROFILE_VOTER, true, val->intval);

		break;

	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:

		if (val->intval)

			vote(chg->fcc_votable, FG_ESR_VOTER, true, val->intval);

		else

			vote(chg->fcc_votable, FG_ESR_VOTER, false, 0);

		break;

	case POWER_SUPPLY_PROP_SET_SHIP_MODE:

		/* Not in ship mode as long as the device is active */

		if (!val->intval)

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

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ enum print_reason { 
#define MOISTURE_VOTER			"MOISTURE_VOTER"

#define HVDCP2_ICL_VOTER		"HVDCP2_ICL_VOTER"

#define OV_VOTER			"OV_VOTER"

#define FG_ESR_VOTER			"FG_ESR_VOTER"



#define VCONN_MAX_ATTEMPTS	3

#define OTG_MAX_ATTEMPTS	3