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

Commit 68faa19b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: qg: Expose cc soc value through power supply property"

parents 5d041459 ed943c63

drivers/power/supply/power_supply_sysfs.c

+1 −0
Original line number Diff line number Diff line
@@ -340,6 +340,7 @@ static struct device_attribute power_supply_attrs[] = { 
	POWER_SUPPLY_ATTR(soh),

	POWER_SUPPLY_ATTR(qc_opti_disable),

	POWER_SUPPLY_ATTR(fcc_stepper_enable),

	POWER_SUPPLY_ATTR(cc_soc),

	/* Local extensions of type int64_t */

	POWER_SUPPLY_ATTR(charge_counter_ext),

	/* Properties of type `const char *' */

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

+4 −0
Original line number Diff line number Diff line
@@ -1772,6 +1772,9 @@ static int qg_psy_get_property(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_SOH:

		pval->intval = chip->soh;

		break;

	case POWER_SUPPLY_PROP_CC_SOC:

		rc = qg_get_cc_soc(chip, &pval->intval);

		break;

	default:

		pr_debug("Unsupported property %d\n", psp);

		break;
@@ -1822,6 +1825,7 @@ static enum power_supply_property qg_psy_props[] = { 
	POWER_SUPPLY_PROP_ESR_ACTUAL,

	POWER_SUPPLY_PROP_ESR_NOMINAL,

	POWER_SUPPLY_PROP_SOH,

	POWER_SUPPLY_PROP_CC_SOC,

};



static const struct power_supply_desc qg_psy_desc = {

include/linux/power_supply.h

+1 −0
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ enum power_supply_property { 
	POWER_SUPPLY_PROP_SOH,

	POWER_SUPPLY_PROP_QC_OPTI_DISABLE,

	POWER_SUPPLY_PROP_FCC_STEPPER_ENABLE,

	POWER_SUPPLY_PROP_CC_SOC,

	/* Local extensions of type int64_t */

	POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,

	/* Properties of type `const char *' */