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

Commit 1e6db67e authored by Umang Agrawal's avatar Umang Agrawal
Browse files

power: smb5: Allow limiting VBUS using power supply property 



Add support to dynamically change the maximum USB input voltage that
can be attained using power supply property voltage_max_limit.

Change-Id: I7aec5dde4c69740ac0f2477c6c7aa8609aa2ac78
Signed-off-by: default avatarUmang Agrawal <uagrawal@codeaurora.org>
parent ae0dcdcc

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

+15 −0
Original line number Diff line number Diff line
@@ -639,6 +639,8 @@ static enum power_supply_property smb5_usb_props[] = { 
	POWER_SUPPLY_PROP_CONNECTOR_TYPE,

	POWER_SUPPLY_PROP_CONNECTOR_HEALTH,

	POWER_SUPPLY_PROP_VOLTAGE_MAX,

	POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN,

	POWER_SUPPLY_PROP_VOLTAGE_MAX_LIMIT,

	POWER_SUPPLY_PROP_SMB_EN_MODE,

	POWER_SUPPLY_PROP_SMB_EN_REASON,

	POWER_SUPPLY_PROP_SCOPE,
@@ -678,9 +680,18 @@ static int smb5_usb_get_prop(struct power_supply *psy, 
		if (chg->real_charger_type == POWER_SUPPLY_TYPE_UNKNOWN)

			val->intval = 0;

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:

		rc = smblib_get_prop_usb_voltage_max_design(chg, val);

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_MAX:

		rc = smblib_get_prop_usb_voltage_max(chg, val);

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_MAX_LIMIT:

		if (chg->usbin_forced_max_uv)

			val->intval = chg->usbin_forced_max_uv;

		else

			smblib_get_prop_usb_voltage_max_design(chg, val);

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_NOW:

		rc = smblib_get_prop_usb_voltage_now(chg, val);

		break;
@@ -881,6 +892,9 @@ static int smb5_usb_set_prop(struct power_supply *psy, 
		else

			rc = -EINVAL;

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_MAX_LIMIT:

		smblib_set_prop_usb_voltage_max_limit(chg, val);

		break;

	default:

		pr_err("set prop %d is not supported\n", psp);

		rc = -EINVAL;
@@ -897,6 +911,7 @@ static int smb5_usb_prop_is_writeable(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_CTM_CURRENT_MAX:

	case POWER_SUPPLY_PROP_CONNECTOR_HEALTH:

	case POWER_SUPPLY_PROP_THERM_ICL_LIMIT:

	case POWER_SUPPLY_PROP_VOLTAGE_MAX_LIMIT:

		return 1;

	default:

		break;

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

+60 −1
Original line number Diff line number Diff line
@@ -1158,6 +1158,7 @@ static void smblib_uusb_removal(struct smb_charger *chg) 


	chg->voltage_min_uv = MICRO_5V;

	chg->voltage_max_uv = MICRO_5V;

	chg->usbin_forced_max_uv = 0;

	chg->usb_icl_delta_ua = 0;

	chg->pulse_cnt = 0;

	chg->uusb_apsd_rerun_done = false;
@@ -2987,7 +2988,7 @@ int smblib_get_prop_usb_online(struct smb_charger *chg, 
	return rc;

}



int smblib_get_prop_usb_voltage_max(struct smb_charger *chg,

int smblib_get_prop_usb_voltage_max_design(struct smb_charger *chg,

				    union power_supply_propval *val)

{

	switch (chg->real_charger_type) {
@@ -3016,6 +3017,37 @@ int smblib_get_prop_usb_voltage_max(struct smb_charger *chg, 
	return 0;

}



int smblib_get_prop_usb_voltage_max(struct smb_charger *chg,

					union power_supply_propval *val)

{

	switch (chg->real_charger_type) {

	case POWER_SUPPLY_TYPE_USB_HVDCP:

		if (chg->qc2_unsupported_voltage == QC2_NON_COMPLIANT_9V) {

			val->intval = MICRO_5V;

			break;

		} else if (chg->qc2_unsupported_voltage ==

				QC2_NON_COMPLIANT_12V) {

			val->intval = MICRO_9V;

			break;

		}

		/* else, fallthrough */

	case POWER_SUPPLY_TYPE_USB_HVDCP_3:

		if (chg->smb_version == PMI632_SUBTYPE)

			val->intval = MICRO_9V;

		else

			val->intval = MICRO_12V;

		break;

	case POWER_SUPPLY_TYPE_USB_PD:

		val->intval = chg->voltage_max_uv;

		break;

	default:

		val->intval = MICRO_5V;

		break;

	}



	return 0;

}



#define HVDCP3_STEP_UV	200000

static int smblib_estimate_adaptor_voltage(struct smb_charger *chg,

					  union power_supply_propval *val)
@@ -3838,6 +3870,32 @@ int smblib_set_prop_boost_current(struct smb_charger *chg, 
	return rc;

}



int smblib_set_prop_usb_voltage_max_limit(struct smb_charger *chg,

					const union power_supply_propval *val)

{

	union power_supply_propval pval = {0, };



	/* Exit if same value is re-configured */

	if (val->intval == chg->usbin_forced_max_uv)

		return 0;



	smblib_get_prop_usb_voltage_max_design(chg, &pval);



	if (val->intval >= MICRO_5V && val->intval <= pval.intval) {

		chg->usbin_forced_max_uv = val->intval;

		smblib_dbg(chg, PR_MISC, "Max VBUS limit changed to: %d\n",

				val->intval);

	} else if (chg->usbin_forced_max_uv) {

		chg->usbin_forced_max_uv = 0;

	} else {

		return 0;

	}



	power_supply_changed(chg->usb_psy);



	return 0;

}



int smblib_set_prop_typec_power_role(struct smb_charger *chg,

				     const union power_supply_propval *val)

{
@@ -5234,6 +5292,7 @@ static void typec_src_removal(struct smb_charger *chg) 
	chg->usb_icl_delta_ua = 0;

	chg->voltage_min_uv = MICRO_5V;

	chg->voltage_max_uv = MICRO_5V;

	chg->usbin_forced_max_uv = 0;



	/* write back the default FLOAT charger configuration */

	rc = smblib_masked_write(chg, USBIN_OPTIONS_2_CFG_REG,

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

+5 −0
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ struct smb_charger { 
	int			charge_full_cc;

	int			cc_soc_ref;

	int			dr_mode;

	int			usbin_forced_max_uv;



	/* workaround flag */

	u32			wa_flags;
@@ -655,6 +656,10 @@ int smblib_get_prop_usb_suspend(struct smb_charger *chg, 
				union power_supply_propval *val);

int smblib_get_prop_usb_voltage_max(struct smb_charger *chg,

				union power_supply_propval *val);

int smblib_get_prop_usb_voltage_max_design(struct smb_charger *chg,

				union power_supply_propval *val);

int smblib_set_prop_usb_voltage_max_limit(struct smb_charger *chg,

				const union power_supply_propval *val);

int smblib_get_prop_usb_voltage_now(struct smb_charger *chg,

				union power_supply_propval *val);

int smblib_get_prop_low_power(struct smb_charger *chg,