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

Commit 7d1a1e75 authored by Ashay Jaiswal's avatar Ashay Jaiswal Committed by Guru Das Srinagesh
Browse files

power: smb5: fix term current configuration logic 



Fix term current computation logic and updated term current
configuration logic to support PMI632.

Change-Id: I17d97cd3da40f34727f6eb888855dca601b655b5
Signed-off-by: default avatarAshay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: default avatarUmang Agrawal <uagrawal@codeaurora.org>
parent 1d452571

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

+17 −10
Original line number Diff line number Diff line
@@ -1937,30 +1937,37 @@ static int smb5_configure_micro_usb(struct smb_charger *chg) 
	return rc;

}



#define RAW_ITERM(iterm_ma, max_range)				\

		div_s64((int64_t)iterm_ma * ADC_CHG_ITERM_MASK, max_range)

static int smb5_configure_iterm_thresholds_adc(struct smb5 *chip)

{

	u8 *buf;

	int rc = 0;

	s16 raw_hi_thresh, raw_lo_thresh;

	s16 raw_hi_thresh, raw_lo_thresh, max_limit_ma;

	struct smb_charger *chg = &chip->chg;



	if (chip->dt.term_current_thresh_hi_ma < -10000 ||

			chip->dt.term_current_thresh_hi_ma > 10000 ||

			chip->dt.term_current_thresh_lo_ma < -10000 ||

			chip->dt.term_current_thresh_lo_ma > 10000) {

	if (chip->chg.smb_version == PMI632_SUBTYPE)

		max_limit_ma = ITERM_LIMITS_PMI632_MA;

	else

		max_limit_ma = ITERM_LIMITS_PM8150B_MA;



	if (chip->dt.term_current_thresh_hi_ma < (-1 * max_limit_ma)

		|| chip->dt.term_current_thresh_hi_ma > max_limit_ma

		|| chip->dt.term_current_thresh_lo_ma < (-1 * max_limit_ma)

		|| chip->dt.term_current_thresh_lo_ma > max_limit_ma) {

		dev_err(chg->dev, "ITERM threshold out of range rc=%d\n", rc);

		return -EINVAL;

	}



	/*

	 * Conversion:

	 *	raw (A) = (scaled_mA * ADC_CHG_TERM_MASK) / (10 * 1000)

	 *	raw (A) = (term_current * ADC_CHG_ITERM_MASK) / max_limit_ma

	 * Note: raw needs to be converted to big-endian format.

	 */



	if (chip->dt.term_current_thresh_hi_ma) {

		raw_hi_thresh = ((chip->dt.term_current_thresh_hi_ma *

						ADC_CHG_TERM_MASK) / 10000);

		raw_hi_thresh = RAW_ITERM(chip->dt.term_current_thresh_hi_ma,

					max_limit_ma);

		raw_hi_thresh = sign_extend32(raw_hi_thresh, 15);

		buf = (u8 *)&raw_hi_thresh;

		raw_hi_thresh = buf[1] | (buf[0] << 8);
@@ -1975,8 +1982,8 @@ static int smb5_configure_iterm_thresholds_adc(struct smb5 *chip) 
	}



	if (chip->dt.term_current_thresh_lo_ma) {

		raw_lo_thresh = ((chip->dt.term_current_thresh_lo_ma *

					ADC_CHG_TERM_MASK) / 10000);

		raw_lo_thresh = RAW_ITERM(chip->dt.term_current_thresh_lo_ma,

					max_limit_ma);

		raw_lo_thresh = sign_extend32(raw_lo_thresh, 15);

		buf = (u8 *)&raw_lo_thresh;

		raw_lo_thresh = buf[1] | (buf[0] << 8);

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

+8 −1
Original line number Diff line number Diff line
@@ -2011,7 +2011,14 @@ int smblib_get_prop_batt_iterm(struct smb_charger *chg, 


	temp = buf[1] | (buf[0] << 8);

	temp = sign_extend32(temp, 15);

	temp = DIV_ROUND_CLOSEST(temp * 10000, ADC_CHG_TERM_MASK);



	if (chg->smb_version == PMI632_SUBTYPE)

		temp = DIV_ROUND_CLOSEST(temp * ITERM_LIMITS_PMI632_MA,

					ADC_CHG_ITERM_MASK);

	else

		temp = DIV_ROUND_CLOSEST(temp * ITERM_LIMITS_PM8150B_MA,

					ADC_CHG_ITERM_MASK);



	val->intval = temp;



	return rc;

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

+3 −1
Original line number Diff line number Diff line
@@ -71,7 +71,9 @@ enum print_reason { 


#define VBAT_TO_VRAW_ADC(v)		div_u64((u64)v * 1000000UL, 194637UL)



#define ADC_CHG_TERM_MASK	32767

#define ITERM_LIMITS_PMI632_MA		5000

#define ITERM_LIMITS_PM8150B_MA		10000

#define ADC_CHG_ITERM_MASK		32767



#define SDP_100_MA			100000

#define SDP_CURRENT_UA			500000