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

Commit f9aa6ad6 authored by Sahil Chandna's avatar Sahil Chandna
Browse files

power: smb5: Add support for PPS constant current(CC) mode 



Add support for PPS CC mode charging for dual charge pumps
with MID-VBAT configuration.

If a charging adapter is put in constant current (CC) mode during charging,
the supply provides the requested constant current. As a result, its output
voltage is automatically adjusted according to the load, and falls into
charge pump operational range.

For CC mode add an ability to configure the ICL and main-charger's FCC
current using power-supply properties.

Use POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT to report the total
FCC which can be pumped into the battery at that point in time.

On charger removal, reset all the votes casted during CC mode.

Change-Id: I242e92b87753d962289c94eedb054b2e8b67b99d
Signed-off-by: default avatarSahil Chandna <chandna@codeaurora.org>
parent b11404df

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

+72 −0
Original line number Diff line number Diff line
@@ -292,6 +292,11 @@ enum { 
	SMB_THERM,

};



static const struct clamp_config clamp_levels[] = {

	{ {0x11C6, 0x11F9, 0x13F1}, {0x60, 0x2E, 0x90} },

	{ {0x11C6, 0x11F9, 0x13F1}, {0x60, 0x2B, 0x9C} },

};



#define PMI632_MAX_ICL_UA	3000000

#define PM6150_MAX_FCC_UA	3000000

static int smb5_chg_config_init(struct smb5 *chip)
@@ -701,6 +706,33 @@ static int smb5_parse_dt(struct smb5 *chip) 
	return 0;

}



static int smb5_set_prop_comp_clamp_level(struct smb_charger *chg,

			     const union power_supply_propval *val)

{

	int rc = 0, i;

	struct clamp_config clamp_config;

	enum comp_clamp_levels level;



	level = val->intval;

	if (level >= MAX_CLAMP_LEVEL) {

		pr_err("Invalid comp clamp level=%d\n", val->intval);

		return -EINVAL;

	}



	for (i = 0; i < ARRAY_SIZE(clamp_config.reg); i++) {

		rc = smblib_write(chg, clamp_levels[level].reg[i],

			     clamp_levels[level].val[i]);

		if (rc < 0)

			dev_err(chg->dev,

				"Failed to configure comp clamp settings for reg=0x%04x rc=%d\n",

				   clamp_levels[level].reg[i], rc);

	}



	chg->comp_clamp_level = val->intval;



	return rc;

}



/************************

 * USB PSY REGISTRATION *

 ************************/
@@ -732,6 +764,7 @@ static enum power_supply_property smb5_usb_props[] = { 
	POWER_SUPPLY_PROP_VOLTAGE_MAX_LIMIT,

	POWER_SUPPLY_PROP_SMB_EN_MODE,

	POWER_SUPPLY_PROP_SMB_EN_REASON,

	POWER_SUPPLY_PROP_ADAPTER_CC_MODE,

	POWER_SUPPLY_PROP_SCOPE,

	POWER_SUPPLY_PROP_MOISTURE_DETECTED,

	POWER_SUPPLY_PROP_HVDCP_OPTI_ALLOWED,
@@ -875,6 +908,9 @@ static int smb5_usb_get_prop(struct power_supply *psy, 
		val->intval = get_client_vote(chg->usb_icl_votable,

					THERMAL_THROTTLE_VOTER);

		break;

	case POWER_SUPPLY_PROP_ADAPTER_CC_MODE:

		val->intval = chg->adapter_cc_mode;

		break;

	default:

		pr_err("get prop %d is not supported in usb\n", psp);

		rc = -EINVAL;
@@ -961,6 +997,9 @@ static int smb5_usb_set_prop(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_VOLTAGE_MAX_LIMIT:

		smblib_set_prop_usb_voltage_max_limit(chg, val);

		break;

	case POWER_SUPPLY_PROP_ADAPTER_CC_MODE:

		chg->adapter_cc_mode = val->intval;

		break;

	default:

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

		rc = -EINVAL;
@@ -978,6 +1017,7 @@ static int smb5_usb_prop_is_writeable(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_CONNECTOR_HEALTH:

	case POWER_SUPPLY_PROP_THERM_ICL_LIMIT:

	case POWER_SUPPLY_PROP_VOLTAGE_MAX_LIMIT:

	case POWER_SUPPLY_PROP_ADAPTER_CC_MODE:

		return 1;

	default:

		break;
@@ -1129,6 +1169,9 @@ static enum power_supply_property smb5_usb_main_props[] = { 
	POWER_SUPPLY_PROP_TOGGLE_STAT,

	POWER_SUPPLY_PROP_MAIN_FCC_MAX,

	POWER_SUPPLY_PROP_IRQ_STATUS,

	POWER_SUPPLY_PROP_FORCE_MAIN_FCC,

	POWER_SUPPLY_PROP_FORCE_MAIN_ICL,

	POWER_SUPPLY_PROP_COMP_CLAMP_LEVEL,

};



static int smb5_usb_main_get_prop(struct power_supply *psy,
@@ -1177,6 +1220,17 @@ static int smb5_usb_main_get_prop(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_IRQ_STATUS:

		rc = smblib_get_irq_status(chg, val);

		break;

	case POWER_SUPPLY_PROP_FORCE_MAIN_FCC:

		rc = smblib_get_charge_param(chg, &chg->param.fcc,

							&val->intval);

		break;

	case POWER_SUPPLY_PROP_FORCE_MAIN_ICL:

		rc = smblib_get_charge_param(chg, &chg->param.usb_icl,

							&val->intval);

		break;

	case POWER_SUPPLY_PROP_COMP_CLAMP_LEVEL:

		val->intval = chg->comp_clamp_level;

		break;

	default:

		pr_debug("get prop %d is not supported in usb-main\n", psp);

		rc = -EINVAL;
@@ -1247,6 +1301,17 @@ static int smb5_usb_main_set_prop(struct power_supply *psy, 
		chg->main_fcc_max = val->intval;

		rerun_election(chg->fcc_votable);

		break;

	case POWER_SUPPLY_PROP_FORCE_MAIN_FCC:

		vote_override(chg->fcc_main_votable, CC_MODE_VOTER,

				(val->intval < 0) ? false : true, val->intval);

		break;

	case POWER_SUPPLY_PROP_FORCE_MAIN_ICL:

		vote_override(chg->usb_icl_votable, CC_MODE_VOTER,

				(val->intval < 0) ? false : true, val->intval);

		break;

	case POWER_SUPPLY_PROP_COMP_CLAMP_LEVEL:

		rc = smb5_set_prop_comp_clamp_level(chg, val);

		break;

	default:

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

		rc = -EINVAL;
@@ -1264,6 +1329,9 @@ static int smb5_usb_main_prop_is_writeable(struct power_supply *psy, 
	switch (psp) {

	case POWER_SUPPLY_PROP_TOGGLE_STAT:

	case POWER_SUPPLY_PROP_MAIN_FCC_MAX:

	case POWER_SUPPLY_PROP_FORCE_MAIN_FCC:

	case POWER_SUPPLY_PROP_FORCE_MAIN_ICL:

	case POWER_SUPPLY_PROP_COMP_CLAMP_LEVEL:

		rc = 1;

		break;

	default:
@@ -1452,6 +1520,7 @@ static enum power_supply_property smb5_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_CHARGE_TERM_CURRENT,

	POWER_SUPPLY_PROP_TEMP,

	POWER_SUPPLY_PROP_TECHNOLOGY,
@@ -1543,6 +1612,9 @@ static int smb5_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_effective_result(chg->fcc_votable);

		break;

	case POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT:

		rc = smblib_get_prop_batt_iterm(chg, val);

		break;

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

+4 −1
Original line number Diff line number Diff line
@@ -5584,8 +5584,11 @@ static void typec_src_removal(struct smb_charger *chg) 
	chg->voltage_max_uv = MICRO_5V;

	chg->usbin_forced_max_uv = 0;



	/* Reset CC mode Votes */

	/* Reset all CC mode votes */

	vote(chg->fcc_main_votable, MAIN_FCC_VOTER, false, 0);

	chg->adapter_cc_mode = 0;

	vote_override(chg->fcc_votable, CC_MODE_VOTER, false, 0);

	vote_override(chg->usb_icl_votable, CC_MODE_VOTER, false, 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

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

#define HDC_IRQ_VOTER			"HDC_IRQ_VOTER"

#define DETACH_DETECT_VOTER		"DETACH_DETECT_VOTER"

#define CC_MODE_VOTER			"CC_MODE_VOTER"

#define MAIN_FCC_VOTER			"MAIN_FCC_VOTER"



#define BOOST_BACK_STORM_COUNT	3
@@ -219,6 +220,17 @@ enum chg_term_config_src { 
	ITERM_SRC_ANALOG

};



enum comp_clamp_levels {

	CLAMP_LEVEL_DEFAULT = 0,

	CLAMP_LEVEL_1,

	MAX_CLAMP_LEVEL,

};



struct clamp_config {

	u16 reg[3];

	u16 val[3];

};



struct smb_irq_info {

	const char			*name;

	const irq_handler_t		handler;
@@ -384,6 +396,9 @@ struct smb_charger { 
	/* parallel charging */

	struct parallel_params	pl;



	/* CC Mode */

	int	adapter_cc_mode;



	/* regulators */

	struct smb_regulator	*vbus_vreg;

	struct smb_regulator	*vconn_vreg;
@@ -512,6 +527,7 @@ struct smb_charger { 
	int			last_cc_soc;

	int			usbin_forced_max_uv;

	int			init_thermal_ua;

	u32			comp_clamp_level;



	/* workaround flag */

	u32			wa_flags;