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

Commit af38fdcb authored by Anirudh Ghayal's avatar Anirudh Ghayal
Browse files

power: qpnp-qg/fg-gen3: Report the REAL_CAPACITY 



REAL_CAPACITY reports the unscaled battery capacity.

Change-Id: I7a016cdf89904f4d5ecbfd9b9afbd05fbfe62442
Signed-off-by: default avatarAnirudh Ghayal <aghayal@codeaurora.org>
parent 7eb574c5

drivers/power/supply/qcom/qpnp-fg-gen3.c

+9 −0
Original line number Diff line number Diff line
@@ -936,6 +936,11 @@ static int fg_get_prop_capacity(struct fg_chip *chip, int *val) 
	return 0;

}



static int fg_get_prop_real_capacity(struct fg_chip *chip, int *val)

{

	return fg_get_msoc(chip, val);

}



#define DEFAULT_BATT_TYPE	"Unknown Battery"

#define MISSING_BATT_TYPE	"Missing Battery"

#define LOADING_BATT_TYPE	"Loading Battery"
@@ -4105,6 +4110,9 @@ static int fg_psy_get_property(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_CC_STEP_SEL:

		pval->intval = chip->ttf.cc_step.sel;

		break;

	case POWER_SUPPLY_PROP_REAL_CAPACITY:

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

		break;

	default:

		pr_err("unsupported property %d\n", psp);

		rc = -EINVAL;
@@ -4308,6 +4316,7 @@ static enum power_supply_property fg_psy_props[] = { 
	POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE,

	POWER_SUPPLY_PROP_CC_STEP,

	POWER_SUPPLY_PROP_CC_STEP_SEL,

	POWER_SUPPLY_PROP_REAL_CAPACITY,

};



static const struct power_supply_desc fg_psy_desc = {

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

+13 −0
Original line number Diff line number Diff line
@@ -1547,6 +1547,15 @@ static int qg_get_battery_capacity(struct qpnp_qg *chip, int *soc) 
	return 0;

}



static int qg_get_battery_capacity_real(struct qpnp_qg *chip, int *soc)

{

	mutex_lock(&chip->soc_lock);

	*soc = chip->msoc;

	mutex_unlock(&chip->soc_lock);



	return 0;

}



static int qg_get_charge_counter(struct qpnp_qg *chip, int *charge_counter)

{

	int rc, cc_soc = 0;
@@ -1707,6 +1716,9 @@ static int qg_psy_get_property(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_CAPACITY:

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

		break;

	case POWER_SUPPLY_PROP_REAL_CAPACITY:

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

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_NOW:

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

		break;
@@ -1826,6 +1838,7 @@ static int qg_property_is_writeable(struct power_supply *psy, 


static enum power_supply_property qg_psy_props[] = {

	POWER_SUPPLY_PROP_CAPACITY,

	POWER_SUPPLY_PROP_REAL_CAPACITY,

	POWER_SUPPLY_PROP_TEMP,

	POWER_SUPPLY_PROP_VOLTAGE_NOW,

	POWER_SUPPLY_PROP_VOLTAGE_OCV,