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

Commit d6e0cf48 authored by Harry Yang's avatar Harry Yang
Browse files

qcom: smb-lib: remove FCC_MAX votable 



FCC_MAX votable was introduced as an intermediate votable used by
Qnovo driver for fast charge current vote, but does not fit in
the new requirement that Qnovo force its vote value.

Remove it.

CRs-Fixed: 2004173
Change-Id: Iff8b74113550f808546d61ef864f3935fc5d61fa
Signed-off-by: default avatarHarry Yang <harryy@codeaurora.org>
parent 45ad5727

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

+1 −9
Original line number Diff line number Diff line
@@ -834,7 +834,6 @@ static enum power_supply_property smb2_batt_props[] = { 
	POWER_SUPPLY_PROP_VOLTAGE_NOW,

	POWER_SUPPLY_PROP_VOLTAGE_MAX,

	POWER_SUPPLY_PROP_CURRENT_NOW,

	POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX,

	POWER_SUPPLY_PROP_TEMP,

	POWER_SUPPLY_PROP_TECHNOLOGY,

	POWER_SUPPLY_PROP_STEP_CHARGING_ENABLED,
@@ -898,10 +897,6 @@ static int smb2_batt_get_prop(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_CURRENT_NOW:

		rc = smblib_get_prop_batt_current_now(chg, val);

		break;

	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:

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

					      DEFAULT_VOTER);

		break;

	case POWER_SUPPLY_PROP_TEMP:

		rc = smblib_get_prop_batt_temp(chg, val);

		break;
@@ -958,9 +953,6 @@ static int smb2_batt_set_prop(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_VOLTAGE_MAX:

		vote(chg->fv_votable, DEFAULT_VOTER, true, val->intval);

		break;

	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:

		vote(chg->fcc_max_votable, DEFAULT_VOTER, true, val->intval);

		break;

	case POWER_SUPPLY_PROP_SET_SHIP_MODE:

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

		if (!val->intval)
@@ -1375,7 +1367,7 @@ static int smb2_init_hw(struct smb2 *chip) 
		DEFAULT_VOTER, chip->dt.no_battery, 0);

	vote(chg->dc_suspend_votable,

		DEFAULT_VOTER, chip->dt.no_battery, 0);

	vote(chg->fcc_max_votable,

	vote(chg->fcc_votable,

		DEFAULT_VOTER, true, chip->dt.fcc_ua);

	vote(chg->fv_votable,

		DEFAULT_VOTER, true, chip->dt.fv_uv);

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

+0 −18
Original line number Diff line number Diff line
@@ -763,14 +763,6 @@ static int smblib_dc_suspend_vote_callback(struct votable *votable, void *data, 
	return smblib_set_dc_suspend(chg, (bool)suspend);

}



static int smblib_fcc_max_vote_callback(struct votable *votable, void *data,

			int fcc_ua, const char *client)

{

	struct smb_charger *chg = data;



	return vote(chg->fcc_votable, FCC_MAX_RESULT_VOTER, true, fcc_ua);

}



#define USBIN_25MA	25000

#define USBIN_100MA	100000

#define USBIN_150MA	150000
@@ -3756,14 +3748,6 @@ static int smblib_create_votables(struct smb_charger *chg) 
		return rc;

	}



	chg->fcc_max_votable = create_votable("FCC_MAX", VOTE_MAX,

					smblib_fcc_max_vote_callback,

					chg);

	if (IS_ERR(chg->fcc_max_votable)) {

		rc = PTR_ERR(chg->fcc_max_votable);

		return rc;

	}



	chg->usb_icl_votable = create_votable("USB_ICL", VOTE_MIN,

					smblib_usb_icl_vote_callback,

					chg);
@@ -3857,8 +3841,6 @@ static void smblib_destroy_votables(struct smb_charger *chg) 
		destroy_votable(chg->usb_suspend_votable);

	if (chg->dc_suspend_votable)

		destroy_votable(chg->dc_suspend_votable);

	if (chg->fcc_max_votable)

		destroy_votable(chg->fcc_max_votable);

	if (chg->usb_icl_votable)

		destroy_votable(chg->usb_icl_votable);

	if (chg->dc_icl_votable)

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

+0 −2
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ enum print_reason { 
#define CHG_STATE_VOTER			"CHG_STATE_VOTER"

#define TYPEC_SRC_VOTER			"TYPEC_SRC_VOTER"

#define TAPER_END_VOTER			"TAPER_END_VOTER"

#define FCC_MAX_RESULT_VOTER		"FCC_MAX_RESULT_VOTER"

#define THERMAL_DAEMON_VOTER		"THERMAL_DAEMON_VOTER"

#define CC_DETACHED_VOTER		"CC_DETACHED_VOTER"

#define HVDCP_TIMEOUT_VOTER		"HVDCP_TIMEOUT_VOTER"
@@ -202,7 +201,6 @@ struct smb_charger { 
	/* votables */

	struct votable		*usb_suspend_votable;

	struct votable		*dc_suspend_votable;

	struct votable		*fcc_max_votable;

	struct votable		*fcc_votable;

	struct votable		*fv_votable;

	struct votable		*usb_icl_votable;