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

Commit a1caa780 authored by Umang Agrawal's avatar Umang Agrawal
Browse files

power: smb5: Reflect die health based on DIE_TEMP_STATUS 



Currently die health is reported based on TEMP_RANGE_STATUS register
which reflects the temperature level as a combination of all die, skin
and connector temperature status.

Change die health reporting to be based on DIE_TEMP_STATUS only.

Change-Id: I08350c626e6116eee65aae26c5d5c19968776cfe
Signed-off-by: default avatarUmang Agrawal <uagrawal@codeaurora.org>
parent 31cc9348

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

+1 −1
Original line number Diff line number Diff line
@@ -1267,7 +1267,7 @@ static int smb5_batt_get_prop(struct power_supply *psy, 
		break;

	case POWER_SUPPLY_PROP_DIE_HEALTH:

		if (chg->die_health == -EINVAL)

			rc = smblib_get_prop_die_health(chg, val);

			val->intval = smblib_get_prop_die_health(chg);

		else

			val->intval = chg->die_health;

		break;

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

+14 −24
Original line number Diff line number Diff line
@@ -2663,38 +2663,28 @@ int smblib_get_pe_start(struct smb_charger *chg, 
	return 0;

}



int smblib_get_prop_die_health(struct smb_charger *chg,

						union power_supply_propval *val)

int smblib_get_prop_die_health(struct smb_charger *chg)

{

	int rc;

	u8 stat;



	rc = smblib_read(chg, TEMP_RANGE_STATUS_REG, &stat);

	rc = smblib_read(chg, DIE_TEMP_STATUS_REG, &stat);

	if (rc < 0) {

		smblib_err(chg, "Couldn't read TEMP_RANGE_STATUS_REG rc=%d\n",

		smblib_err(chg, "Couldn't read DIE_TEMP_STATUS_REG, rc=%d\n",

				rc);

		return rc;

		return POWER_SUPPLY_HEALTH_UNKNOWN;

	}



	/* TEMP_RANGE bits are mutually exclusive */

	switch (stat & TEMP_RANGE_MASK) {

	case TEMP_BELOW_RANGE_BIT:

		val->intval = POWER_SUPPLY_HEALTH_COOL;

		break;

	case TEMP_WITHIN_RANGE_BIT:

		val->intval = POWER_SUPPLY_HEALTH_WARM;

		break;

	case TEMP_ABOVE_RANGE_BIT:

		val->intval = POWER_SUPPLY_HEALTH_HOT;

		break;

	case ALERT_LEVEL_BIT:

		val->intval = POWER_SUPPLY_HEALTH_OVERHEAT;

		break;

	default:

		val->intval = POWER_SUPPLY_HEALTH_UNKNOWN;

	}

	if (stat & DIE_TEMP_RST_BIT)

		return POWER_SUPPLY_HEALTH_OVERHEAT;



	return 0;

	if (stat & DIE_TEMP_UB_BIT)

		return POWER_SUPPLY_HEALTH_HOT;



	if (stat & DIE_TEMP_LB_BIT)

		return POWER_SUPPLY_HEALTH_WARM;



	return POWER_SUPPLY_HEALTH_COOL;

}



int smblib_get_prop_connector_health(struct smb_charger *chg)

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

+1 −2
Original line number Diff line number Diff line
@@ -557,8 +557,7 @@ int smblib_get_pe_start(struct smb_charger *chg, 
			       union power_supply_propval *val);

int smblib_get_prop_charger_temp(struct smb_charger *chg,

				union power_supply_propval *val);

int smblib_get_prop_die_health(struct smb_charger *chg,

			       union power_supply_propval *val);

int smblib_get_prop_die_health(struct smb_charger *chg);

int smblib_get_prop_connector_health(struct smb_charger *chg);

int smblib_set_prop_pd_current_max(struct smb_charger *chg,

				const union power_supply_propval *val);

drivers/power/supply/qcom/smb5-reg.h

+6 −0
Original line number Diff line number Diff line
@@ -403,6 +403,12 @@ enum { 
#define TEMP_BELOW_RANGE_BIT			BIT(1)

#define THERMREG_DISABLED_BIT			BIT(0)



#define DIE_TEMP_STATUS_REG			(MISC_BASE + 0x07)

#define DIE_TEMP_SHDN_BIT			BIT(3)

#define DIE_TEMP_RST_BIT			BIT(2)

#define DIE_TEMP_UB_BIT				BIT(1)

#define DIE_TEMP_LB_BIT				BIT(0)



#define CONNECTOR_TEMP_STATUS_REG		(MISC_BASE + 0x09)

#define CONNECTOR_TEMP_SHDN_BIT			BIT(3)

#define CONNECTOR_TEMP_RST_BIT			BIT(2)