Merge "power: qpnp-smb2: expose CHARGE_COUNTER prop via batt psy" (88e2c172) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/power/supply/power_supply_sysfs.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -314,6 +314,9 @@ static struct device_attribute power_supply_attrs[] = {
		POWER_SUPPLY_ATTR(cc_step),
		POWER_SUPPLY_ATTR(cc_step_sel),
		POWER_SUPPLY_ATTR(sw_jeita_enabled),
		POWER_SUPPLY_ATTR(pd_voltage_max),
		POWER_SUPPLY_ATTR(pd_voltage_min),
		POWER_SUPPLY_ATTR(sdp_current_max),
		/* Local extensions of type int64_t */
		POWER_SUPPLY_ATTR(charge_counter_ext),
		/* Properties of type `const char ' /

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

+37 −18

Original line number	Diff line number	Diff line
		@@ -330,7 +330,6 @@ static int smb2_parse_dt(struct smb2 *chip)
		static enum power_supply_property smb2_usb_props[] = {
		POWER_SUPPLY_PROP_PRESENT,
		POWER_SUPPLY_PROP_ONLINE,
		POWER_SUPPLY_PROP_VOLTAGE_MIN,
		POWER_SUPPLY_PROP_VOLTAGE_MAX,
		POWER_SUPPLY_PROP_VOLTAGE_NOW,
		POWER_SUPPLY_PROP_PD_CURRENT_MAX,
		@@ -349,6 +348,9 @@ static enum power_supply_property smb2_usb_props[] = {
		POWER_SUPPLY_PROP_HW_CURRENT_MAX,
		POWER_SUPPLY_PROP_REAL_TYPE,
		POWER_SUPPLY_PROP_PR_SWAP,
		POWER_SUPPLY_PROP_PD_VOLTAGE_MAX,
		POWER_SUPPLY_PROP_PD_VOLTAGE_MIN,
		POWER_SUPPLY_PROP_SDP_CURRENT_MAX,
		};

		static int smb2_usb_get_prop(struct power_supply *psy,
		@@ -380,20 +382,17 @@ static int smb2_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_MIN:
		val->intval = chg->voltage_min_uv;
		break;
		case POWER_SUPPLY_PROP_VOLTAGE_MAX:
		val->intval = chg->voltage_max_uv;
		rc = smblib_get_prop_usb_voltage_max(chg, val);
		break;
		case POWER_SUPPLY_PROP_VOLTAGE_NOW:
		rc = smblib_get_prop_usb_voltage_now(chg, val);
		break;
		case POWER_SUPPLY_PROP_PD_CURRENT_MAX:
		rc = smblib_get_prop_pd_current_max(chg, val);
		val->intval = get_client_vote(chg->usb_icl_votable, PD_VOTER);
		break;
		case POWER_SUPPLY_PROP_CURRENT_MAX:
		rc = smblib_get_prop_usb_current_max(chg, val);
		rc = smblib_get_prop_input_current_settled(chg, val);
		break;
		case POWER_SUPPLY_PROP_TYPE:
		val->intval = POWER_SUPPLY_TYPE_USB_PD;
		@@ -457,6 +456,16 @@ static int smb2_usb_get_prop(struct power_supply *psy,
		case POWER_SUPPLY_PROP_PR_SWAP:
		rc = smblib_get_prop_pr_swap_in_progress(chg, val);
		break;
		case POWER_SUPPLY_PROP_PD_VOLTAGE_MAX:
		val->intval = chg->voltage_max_uv;
		break;
		case POWER_SUPPLY_PROP_PD_VOLTAGE_MIN:
		val->intval = chg->voltage_min_uv;
		break;
		case POWER_SUPPLY_PROP_SDP_CURRENT_MAX:
		val->intval = get_client_vote(chg->usb_icl_votable,
		USB_PSY_VOTER);
		break;
		default:
		pr_err("get prop %d is not supported in usb\n", psp);
		rc = -EINVAL;
		@@ -484,18 +493,9 @@ static int smb2_usb_set_prop(struct power_supply *psy,
		}

		switch (psp) {
		case POWER_SUPPLY_PROP_VOLTAGE_MIN:
		rc = smblib_set_prop_usb_voltage_min(chg, val);
		break;
		case POWER_SUPPLY_PROP_VOLTAGE_MAX:
		rc = smblib_set_prop_usb_voltage_max(chg, val);
		break;
		case POWER_SUPPLY_PROP_PD_CURRENT_MAX:
		rc = smblib_set_prop_pd_current_max(chg, val);
		break;
		case POWER_SUPPLY_PROP_CURRENT_MAX:
		rc = smblib_set_prop_usb_current_max(chg, val);
		break;
		case POWER_SUPPLY_PROP_TYPEC_POWER_ROLE:
		rc = smblib_set_prop_typec_power_role(chg, val);
		break;
		@@ -518,6 +518,15 @@ static int smb2_usb_set_prop(struct power_supply *psy,
		case POWER_SUPPLY_PROP_PR_SWAP:
		rc = smblib_set_prop_pr_swap_in_progress(chg, val);
		break;
		case POWER_SUPPLY_PROP_PD_VOLTAGE_MAX:
		rc = smblib_set_prop_pd_voltage_max(chg, val);
		break;
		case POWER_SUPPLY_PROP_PD_VOLTAGE_MIN:
		rc = smblib_set_prop_pd_voltage_min(chg, val);
		break;
		case POWER_SUPPLY_PROP_SDP_CURRENT_MAX:
		rc = smblib_set_prop_sdp_current_max(chg, val);
		break;
		default:
		pr_err("set prop %d is not supported\n", psp);
		rc = -EINVAL;
		@@ -533,8 +542,6 @@ static int smb2_usb_prop_is_writeable(struct power_supply *psy,
		enum power_supply_property psp)
		{
		switch (psp) {
		case POWER_SUPPLY_PROP_CURRENT_MAX:
		case POWER_SUPPLY_PROP_TYPEC_POWER_ROLE:
		case POWER_SUPPLY_PROP_CTM_CURRENT_MAX:
		return 1;
		default:
		@@ -576,6 +583,8 @@ static int smb2_init_usb_psy(struct smb2 *chip)
		static enum power_supply_property smb2_usb_port_props[] = {
		POWER_SUPPLY_PROP_TYPE,
		POWER_SUPPLY_PROP_ONLINE,
		POWER_SUPPLY_PROP_VOLTAGE_MAX,
		POWER_SUPPLY_PROP_CURRENT_MAX,
		};

		static int smb2_usb_port_get_prop(struct power_supply *psy,
		@@ -602,6 +611,12 @@ static int smb2_usb_port_get_prop(struct power_supply *psy,
		else
		val->intval = 0;
		break;
		case POWER_SUPPLY_PROP_VOLTAGE_MAX:
		val->intval = 5000000;
		break;
		case POWER_SUPPLY_PROP_CURRENT_MAX:
		rc = smblib_get_prop_input_current_settled(chg, val);
		break;
		default:
		pr_err_ratelimited("Get prop %d is not supported in pc_port\n",
		psp);
		@@ -909,6 +924,7 @@ static enum power_supply_property smb2_batt_props[] = {
		POWER_SUPPLY_PROP_DP_DM,
		POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX,
		POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT,
		POWER_SUPPLY_PROP_CHARGE_COUNTER,
		};

		static int smb2_batt_get_prop(struct power_supply *psy,
		@@ -1017,6 +1033,9 @@ static int smb2_batt_get_prop(struct power_supply *psy,
		case POWER_SUPPLY_PROP_RERUN_AICL:
		val->intval = 0;
		break;
		case POWER_SUPPLY_PROP_CHARGE_COUNTER:
		rc = smblib_get_prop_batt_charge_counter(chg, val);
		break;
		default:
		pr_err("batt power supply prop %d not supported\n", psp);
		return -EINVAL;

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

+48 −29

Original line number	Diff line number	Diff line
		@@ -419,20 +419,22 @@ static int smblib_set_adapter_allowance(struct smb_charger *chg,
		{
		int rc = 0;

		/* PM660 only support max. 9V */
		if (chg->smb_version == PM660_SUBTYPE) {
		switch (allowed_voltage) {
		case USBIN_ADAPTER_ALLOW_12V:
		case USBIN_ADAPTER_ALLOW_5V_OR_12V:
		case USBIN_ADAPTER_ALLOW_9V_TO_12V:
		allowed_voltage = USBIN_ADAPTER_ALLOW_9V;
		break;
		case USBIN_ADAPTER_ALLOW_5V_OR_12V:
		case USBIN_ADAPTER_ALLOW_5V_OR_9V_TO_12V:
		allowed_voltage = USBIN_ADAPTER_ALLOW_5V_OR_9V;
		break;
		case USBIN_ADAPTER_ALLOW_5V_TO_12V:
		/* PM660 only support max. 9V */
		if (chg->smb_version == PM660_SUBTYPE) {
		smblib_dbg(chg, PR_MISC, "voltage not supported=%d\n",
		allowed_voltage);
		allowed_voltage = USBIN_ADAPTER_ALLOW_5V_TO_9V;
		}
		break;
		}
		}

		rc = smblib_write(chg, USBIN_ADAPTER_ALLOW_CFG_REG, allowed_voltage);
		if (rc < 0) {
		@@ -1855,6 +1857,19 @@ int smblib_get_prop_charge_qnovo_enable(struct smb_charger *chg,
		return 0;
		}

		int smblib_get_prop_batt_charge_counter(struct smb_charger *chg,
		union power_supply_propval *val)
		{
		int rc;

		if (!chg->bms_psy)
		return -EINVAL;

		rc = power_supply_get_property(chg->bms_psy,
		POWER_SUPPLY_PROP_CHARGE_COUNTER, val);
		return rc;
		}

		/***********************
		* BATTERY PSY SETTERS *
		***********************/
		@@ -2213,6 +2228,25 @@ int smblib_get_prop_usb_online(struct smb_charger *chg,
		return rc;
		}

		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:
		case POWER_SUPPLY_TYPE_USB_PD:
		if (chg->smb_version == PM660_SUBTYPE)
		val->intval = MICRO_9V;
		else
		val->intval = MICRO_12V;
		break;
		default:
		val->intval = MICRO_5V;
		break;
		}

		return 0;
		}

		int smblib_get_prop_usb_voltage_now(struct smb_charger *chg,
		union power_supply_propval *val)
		{
		@@ -2232,21 +2266,6 @@ int smblib_get_prop_usb_voltage_now(struct smb_charger *chg,
		return iio_read_channel_processed(chg->iio.usbin_v_chan, &val->intval);
		}

		int smblib_get_prop_pd_current_max(struct smb_charger *chg,
		union power_supply_propval *val)
		{
		val->intval = get_client_vote_locked(chg->usb_icl_votable, PD_VOTER);
		return 0;
		}

		int smblib_get_prop_usb_current_max(struct smb_charger *chg,
		union power_supply_propval *val)
		{
		val->intval = get_client_vote_locked(chg->usb_icl_votable,
		USB_PSY_VOTER);
		return 0;
		}

		int smblib_get_prop_usb_current_now(struct smb_charger *chg,
		union power_supply_propval *val)
		{
		@@ -2584,7 +2603,7 @@ static int smblib_handle_usb_current(struct smb_charger *chg,
		return rc;
		}

		int smblib_set_prop_usb_current_max(struct smb_charger *chg,
		int smblib_set_prop_sdp_current_max(struct smb_charger *chg,
		const union power_supply_propval *val)
		{
		int rc = 0;
		@@ -2671,7 +2690,7 @@ int smblib_set_prop_typec_power_role(struct smb_charger *chg,
		return rc;
		}

		int smblib_set_prop_usb_voltage_min(struct smb_charger *chg,
		int smblib_set_prop_pd_voltage_min(struct smb_charger *chg,
		const union power_supply_propval *val)
		{
		int rc, min_uv;
		@@ -2690,7 +2709,7 @@ int smblib_set_prop_usb_voltage_min(struct smb_charger *chg,
		return rc;
		}

		int smblib_set_prop_usb_voltage_max(struct smb_charger *chg,
		int smblib_set_prop_pd_voltage_max(struct smb_charger *chg,
		const union power_supply_propval *val)
		{
		int rc, max_uv;

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -424,6 +424,8 @@ int smblib_get_prop_batt_current_now(struct smb_charger *chg,
		union power_supply_propval *val);
		int smblib_get_prop_batt_temp(struct smb_charger *chg,
		union power_supply_propval *val);
		int smblib_get_prop_batt_charge_counter(struct smb_charger *chg,
		union power_supply_propval *val);
		int smblib_set_prop_input_suspend(struct smb_charger *chg,
		const union power_supply_propval *val);
		int smblib_set_prop_batt_capacity(struct smb_charger *chg,
		@@ -450,11 +452,9 @@ int smblib_get_prop_usb_online(struct smb_charger *chg,
		union power_supply_propval *val);
		int smblib_get_prop_usb_suspend(struct smb_charger *chg,
		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_pd_current_max(struct smb_charger *chg,
		int smblib_get_prop_usb_voltage_max(struct smb_charger *chg,
		union power_supply_propval *val);
		int smblib_get_prop_usb_current_max(struct smb_charger *chg,
		int smblib_get_prop_usb_voltage_now(struct smb_charger *chg,
		union power_supply_propval *val);
		int smblib_get_prop_usb_current_now(struct smb_charger *chg,
		union power_supply_propval *val);
		@@ -482,11 +482,11 @@ int smblib_get_prop_charge_qnovo_enable(struct smb_charger *chg,
		union power_supply_propval *val);
		int smblib_set_prop_pd_current_max(struct smb_charger *chg,
		const union power_supply_propval *val);
		int smblib_set_prop_usb_current_max(struct smb_charger *chg,
		int smblib_set_prop_sdp_current_max(struct smb_charger *chg,
		const union power_supply_propval *val);
		int smblib_set_prop_usb_voltage_min(struct smb_charger *chg,
		int smblib_set_prop_pd_voltage_max(struct smb_charger *chg,
		const union power_supply_propval *val);
		int smblib_set_prop_usb_voltage_max(struct smb_charger *chg,
		int smblib_set_prop_pd_voltage_min(struct smb_charger *chg,
		const union power_supply_propval *val);
		int smblib_set_prop_boost_current(struct smb_charger *chg,
		const union power_supply_propval *val);

drivers/power/supply/qcom/smb138x-charger.c

+9 −17

Original line number	Diff line number	Diff line
		@@ -215,6 +215,7 @@ static enum power_supply_property smb138x_usb_props[] = {
		POWER_SUPPLY_PROP_TYPEC_MODE,
		POWER_SUPPLY_PROP_TYPEC_POWER_ROLE,
		POWER_SUPPLY_PROP_TYPEC_CC_ORIENTATION,
		POWER_SUPPLY_PROP_SDP_CURRENT_MAX,
		};

		static int smb138x_usb_get_prop(struct power_supply *psy,
		@@ -242,7 +243,7 @@ static int smb138x_usb_get_prop(struct power_supply *psy,
		rc = smblib_get_prop_usb_voltage_now(chg, val);
		break;
		case POWER_SUPPLY_PROP_CURRENT_MAX:
		rc = smblib_get_prop_usb_current_max(chg, val);
		val->intval = get_effective_result(chg->usb_icl_votable);
		break;
		case POWER_SUPPLY_PROP_TYPE:
		val->intval = chg->usb_psy_desc.type;
		@@ -256,6 +257,10 @@ static int smb138x_usb_get_prop(struct power_supply *psy,
		case POWER_SUPPLY_PROP_TYPEC_CC_ORIENTATION:
		rc = smblib_get_prop_typec_cc_orientation(chg, val);
		break;
		case POWER_SUPPLY_PROP_SDP_CURRENT_MAX:
		val->intval = get_client_vote(chg->usb_icl_votable,
		USB_PSY_VOTER);
		break;
		default:
		pr_err("get prop %d is not supported\n", prop);
		return -EINVAL;
		@@ -278,18 +283,12 @@ static int smb138x_usb_set_prop(struct power_supply *psy,
		int rc = 0;

		switch (prop) {
		case POWER_SUPPLY_PROP_VOLTAGE_MIN:
		rc = smblib_set_prop_usb_voltage_min(chg, val);
		break;
		case POWER_SUPPLY_PROP_VOLTAGE_MAX:
		rc = smblib_set_prop_usb_voltage_max(chg, val);
		break;
		case POWER_SUPPLY_PROP_CURRENT_MAX:
		rc = smblib_set_prop_usb_current_max(chg, val);
		break;
		case POWER_SUPPLY_PROP_TYPEC_POWER_ROLE:
		rc = smblib_set_prop_typec_power_role(chg, val);
		break;
		case POWER_SUPPLY_PROP_SDP_CURRENT_MAX:
		rc = smblib_set_prop_sdp_current_max(chg, val);
		break;
		default:
		pr_err("set prop %d is not supported\n", prop);
		return -EINVAL;
		@@ -301,13 +300,6 @@ static int smb138x_usb_set_prop(struct power_supply *psy,
		static int smb138x_usb_prop_is_writeable(struct power_supply *psy,
		enum power_supply_property prop)
		{
		switch (prop) {
		case POWER_SUPPLY_PROP_TYPEC_POWER_ROLE:
		return 1;
		default:
		break;
		}

		return 0;
		}