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

Commit 972af82b authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: qpnp-smb2/5: Report TIME_TO_FULL_NOW and CHARGE_FULL_DESIGN"

parents 17c9055e 8046f269

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

+4 −0
Original line number Diff line number Diff line
@@ -3737,6 +3737,9 @@ static int fg_psy_get_property(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_TIME_TO_FULL_AVG:

		rc = fg_get_time_to_full(fg, &pval->intval);

		break;

	case POWER_SUPPLY_PROP_TIME_TO_FULL_NOW:

		rc = fg_get_time_to_full(fg, &pval->intval);

		break;

	case POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG:

		rc = fg_get_time_to_empty(fg, &pval->intval);

		break;
@@ -3963,6 +3966,7 @@ static enum power_supply_property fg_psy_props[] = { 
	POWER_SUPPLY_PROP_CHARGE_COUNTER_SHADOW,

	POWER_SUPPLY_PROP_TIME_TO_FULL_AVG,

	POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG,

	POWER_SUPPLY_PROP_TIME_TO_FULL_NOW,

	POWER_SUPPLY_PROP_SOC_REPORTING_READY,

	POWER_SUPPLY_PROP_DEBUG_BATTERY,

	POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE,

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

+4 −0
Original line number Diff line number Diff line
@@ -4571,6 +4571,9 @@ static int fg_psy_get_property(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_TIME_TO_FULL_AVG:

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

		break;

	case POWER_SUPPLY_PROP_TIME_TO_FULL_NOW:

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

		break;

	case POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG:

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

		break;
@@ -4755,6 +4758,7 @@ static enum power_supply_property fg_psy_props[] = { 
	POWER_SUPPLY_PROP_DEBUG_BATTERY,

	POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE,

	POWER_SUPPLY_PROP_TIME_TO_FULL_AVG,

	POWER_SUPPLY_PROP_TIME_TO_FULL_NOW,

	POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG,

	POWER_SUPPLY_PROP_CC_STEP,

	POWER_SUPPLY_PROP_CC_STEP_SEL,

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

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

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

		break;

	case POWER_SUPPLY_PROP_TIME_TO_FULL_NOW:

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

		break;

	case POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG:

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

		break;
@@ -2319,6 +2322,7 @@ static enum power_supply_property qg_psy_props[] = { 
	POWER_SUPPLY_PROP_CHARGE_FULL,

	POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,

	POWER_SUPPLY_PROP_TIME_TO_FULL_AVG,

	POWER_SUPPLY_PROP_TIME_TO_FULL_NOW,

	POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG,

	POWER_SUPPLY_PROP_ESR_ACTUAL,

	POWER_SUPPLY_PROP_ESR_NOMINAL,

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

+4 −0
Original line number Diff line number Diff line
@@ -1060,6 +1060,8 @@ static enum power_supply_property smb2_batt_props[] = { 
	POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT,

	POWER_SUPPLY_PROP_CHARGE_COUNTER,

	POWER_SUPPLY_PROP_CHARGE_FULL,

	POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,

	POWER_SUPPLY_PROP_TIME_TO_FULL_NOW,

	POWER_SUPPLY_PROP_CYCLE_COUNT,

	POWER_SUPPLY_PROP_FCC_STEPPER_ENABLE,

};
@@ -1170,9 +1172,11 @@ static int smb2_batt_get_prop(struct power_supply *psy, 
		break;

	case POWER_SUPPLY_PROP_CHARGE_COUNTER:

	case POWER_SUPPLY_PROP_CHARGE_FULL:

	case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:

	case POWER_SUPPLY_PROP_CYCLE_COUNT:

	case POWER_SUPPLY_PROP_VOLTAGE_NOW:

	case POWER_SUPPLY_PROP_TEMP:

	case POWER_SUPPLY_PROP_TIME_TO_FULL_NOW:

		rc = smblib_get_prop_from_bms(chg, psp, val);

		break;

	case POWER_SUPPLY_PROP_CURRENT_NOW:

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

+10 −0
Original line number Diff line number Diff line
@@ -1725,6 +1725,8 @@ static enum power_supply_property smb5_batt_props[] = { 
	POWER_SUPPLY_PROP_RECHARGE_SOC,

	POWER_SUPPLY_PROP_CHARGE_FULL,

	POWER_SUPPLY_PROP_FORCE_RECHARGE,

	POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,

	POWER_SUPPLY_PROP_TIME_TO_FULL_NOW,

	POWER_SUPPLY_PROP_FCC_STEPPER_ENABLE,

};
@@ -1867,6 +1869,14 @@ static int smb5_batt_get_prop(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_FORCE_RECHARGE:

		val->intval = 0;

		break;

	case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:

		rc = smblib_get_prop_from_bms(chg,

				POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN, val);

		break;

	case POWER_SUPPLY_PROP_TIME_TO_FULL_NOW:

		rc = smblib_get_prop_from_bms(chg,

				POWER_SUPPLY_PROP_TIME_TO_FULL_NOW, val);

		break;

	case POWER_SUPPLY_PROP_FCC_STEPPER_ENABLE:

		val->intval = chg->fcc_stepper_enable;

		break;