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

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

Merge "power: qpnp-qg: Add QG voltage-only mode"

parents f5ff4f82 496bb46c

drivers/power/supply/power_supply_sysfs.c

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

	POWER_SUPPLY_ATTR(irq_status),

	POWER_SUPPLY_ATTR(parallel_output_mode),

	POWER_SUPPLY_ATTR(fg_type),

	/* Local extensions of type int64_t */

	POWER_SUPPLY_ATTR(charge_counter_ext),

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

drivers/power/supply/qcom/qg-core.h

+7 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ struct qpnp_qg { 
	struct votable		*good_ocv_irq_disable_votable;

	u32			qg_base;

	u8			qg_subtype;

	u8			qg_mode;



	/* local data variables */

	u32			batt_id_ohm;
@@ -158,6 +159,7 @@ struct qpnp_qg { 
	int			tcss_entry_count;

	int			max_fcc_limit_ma;

	int			bsoc_bass_entry;

	int			qg_v_ibat;

	u32			fifo_done_count;

	u32			wa_flags;

	u32			seq_no;
@@ -261,4 +263,9 @@ enum qg_version { 
	QG_LITE,

};



enum qg_mode {

	QG_V_I_MODE,

	QG_V_MODE,

};



#endif /* __QG_CORE_H__ */

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

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ 
#define QG_MODE_CTL1_REG			0x43

#define PARALLEL_IBAT_SENSE_EN_BIT		BIT(7)



#define QG_MODE_CTL2_REG			0x44

#define VI_MODE_BIT				BIT(0)



#define QG_VBAT_EMPTY_THRESHOLD_REG		0x4B

#define QG_VBAT_LOW_THRESHOLD_REG		0x4C

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

+5 −0
Original line number Diff line number Diff line
@@ -373,6 +373,11 @@ int qg_get_battery_current(struct qpnp_qg *chip, int *ibat_ua) 
		return 0;

	}



	if (chip->qg_mode == QG_V_MODE) {

		*ibat_ua = chip->qg_v_ibat;

		return 0;

	}



	/* hold data */

	rc = qg_masked_write(chip, chip->qg_base + QG_DATA_CTL2_REG,

				BURST_AVG_HOLD_FOR_READ_BIT,

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

+43 −10
Original line number Diff line number Diff line
@@ -442,6 +442,7 @@ static int qg_process_fifo(struct qpnp_qg *chip, u32 fifo_length) 
	u8 v_fifo[MAX_FIFO_LENGTH * 2], i_fifo[MAX_FIFO_LENGTH * 2];

	u32 sample_interval = 0, sample_count = 0, fifo_v = 0, fifo_i = 0;

	unsigned long rtc_sec = 0;

	bool qg_v_mode = (chip->qg_mode == QG_V_MODE);



	rc = get_rtc_time(&rtc_sec);

	if (rc < 0)
@@ -500,7 +501,8 @@ static int qg_process_fifo(struct qpnp_qg *chip, u32 fifo_length) 
		fifo_v = v_fifo[i] | (v_fifo[i + 1] << 8);

		fifo_i = i_fifo[i] | (i_fifo[i + 1] << 8);



		if (fifo_v == FIFO_V_RESET_VAL || fifo_i == FIFO_I_RESET_VAL) {

		if (fifo_v == FIFO_V_RESET_VAL ||

			(fifo_i == FIFO_I_RESET_VAL && !qg_v_mode)) {

			pr_err("Invalid FIFO data V_RAW=%x I_RAW=%x - FIFO rejected\n",

						fifo_v, fifo_i);

			return -EINVAL;
@@ -509,7 +511,8 @@ static int qg_process_fifo(struct qpnp_qg *chip, u32 fifo_length) 
		temp = sign_extend32(fifo_i, 15);



		chip->kdata.fifo[j].v = V_RAW_TO_UV(fifo_v);

		chip->kdata.fifo[j].i = qg_iraw_to_ua(chip, temp);

		chip->kdata.fifo[j].i =

				qg_v_mode ? 0 : qg_iraw_to_ua(chip, temp);

		chip->kdata.fifo[j].interval = sample_interval;

		chip->kdata.fifo[j].count = sample_count;
@@ -519,7 +522,7 @@ static int qg_process_fifo(struct qpnp_qg *chip, u32 fifo_length) 
		qg_dbg(chip, QG_DEBUG_FIFO, "FIFO %d raw_v=%d uV=%d raw_i=%d uA=%d interval=%d count=%d\n",

					j, fifo_v,

					chip->kdata.fifo[j].v,

					fifo_i,

					qg_v_mode ? 0 : fifo_i,

					(int)chip->kdata.fifo[j].i,

					chip->kdata.fifo[j].interval,

					chip->kdata.fifo[j].count);
@@ -537,6 +540,7 @@ static int qg_process_accumulator(struct qpnp_qg *chip) 
	u8 count, index = chip->kdata.fifo_length;

	u64 acc_v = 0, acc_i = 0;

	s64 temp = 0;

	bool qg_v_mode = (chip->qg_mode == QG_V_MODE);



	rc = qg_read(chip, chip->qg_base + QG_ACCUM_CNT_RT_REG,

			&count, 1);
@@ -573,7 +577,8 @@ static int qg_process_accumulator(struct qpnp_qg *chip) 
	temp = sign_extend64(acc_i, 23);



	chip->kdata.fifo[index].v = V_RAW_TO_UV(div_u64(acc_v, count));

	chip->kdata.fifo[index].i = qg_iraw_to_ua(chip, div_s64(temp, count));

	chip->kdata.fifo[index].i = qg_v_mode ?

				0 : qg_iraw_to_ua(chip, div_s64(temp, count));

	chip->kdata.fifo[index].interval = sample_interval;

	chip->kdata.fifo[index].count = count;

	chip->kdata.fifo_length++;
@@ -1194,6 +1199,9 @@ static void process_udata_work(struct work_struct *work) 
	if (chip->udata.param[QG_FULL_SOC].valid)

		chip->full_soc = chip->udata.param[QG_FULL_SOC].data;



	if (chip->udata.param[QG_V_IBAT].valid)

		chip->qg_v_ibat = chip->udata.param[QG_V_IBAT].data;



	if (chip->udata.param[QG_SOC].valid ||

			chip->udata.param[QG_SYS_SOC].valid) {
@@ -1645,8 +1653,8 @@ static int qg_get_cc_soc(void *data, int *cc_soc) 
	}



	if (chip->cc_soc == INT_MIN)

		return -EINVAL;



		*cc_soc = -EINVAL;

	else

		*cc_soc = chip->cc_soc;



	return 0;
@@ -2232,6 +2240,9 @@ static int qg_psy_get_property(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_BATT_AGE_LEVEL:

		pval->intval = chip->batt_age_level;

		break;

	case POWER_SUPPLY_PROP_FG_TYPE:

		pval->intval = chip->qg_mode;

		break;

	default:

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

		break;
@@ -2294,6 +2305,7 @@ static enum power_supply_property qg_psy_props[] = { 
	POWER_SUPPLY_PROP_POWER_NOW,

	POWER_SUPPLY_PROP_SCALE_MODE_EN,

	POWER_SUPPLY_PROP_BATT_AGE_LEVEL,

	POWER_SUPPLY_PROP_FG_TYPE,

};



static const struct power_supply_desc qg_psy_desc = {
@@ -3297,7 +3309,9 @@ static int qg_determine_pon_soc(struct qpnp_qg *chip) 
		return rc;

	}



	chip->cc_soc = chip->sys_soc = soc_raw;

	if (chip->qg_mode == QG_V_I_MODE)

		chip->cc_soc = soc_raw;

	chip->sys_soc = soc_raw;

	chip->last_adj_ssoc = chip->catch_up_soc = chip->msoc = soc;

	chip->kdata.param[QG_PON_OCV_UV].data = ocv_uv;

	chip->kdata.param[QG_PON_OCV_UV].valid = true;
@@ -3415,6 +3429,24 @@ static int qg_hw_init(struct qpnp_qg *chip) 
	else

		chip->max_fcc_limit_ma = IBAT_10A_FCC_MA;



	if (chip->qg_version == QG_LITE) {

		rc = qg_read(chip, chip->qg_base + QG_MODE_CTL2_REG, &reg, 1);

		if (rc < 0) {

			pr_err("Failed to read QG mode rc=%d\n", rc);

			return rc;

		}

		chip->qg_mode = (reg & VI_MODE_BIT) ? QG_V_I_MODE : QG_V_MODE;

	} else {

		chip->qg_mode = QG_V_I_MODE;

	}



	if (chip->qg_mode == QG_V_MODE) {

		chip->dt.esr_disable = true;

		chip->dt.cl_disable = true;

		chip->dt.tcss_enable = false;

		chip->dt.bass_enable = false;

	}



	rc = qg_set_wa_flags(chip);

	if (rc < 0) {

		pr_err("Failed to update PMIC type flags, rc=%d\n", rc);
@@ -4794,9 +4826,10 @@ static int qpnp_qg_probe(struct platform_device *pdev) 


	qg_get_battery_capacity(chip, &soc);



	pr_info("QG initialized! battery_profile=%s SOC=%d QG_subtype=%d QG_version=%s\n",

	pr_info("QG initialized! battery_profile=%s SOC=%d QG_subtype=%d QG_version=%s QG_mode=%s\n",

			qg_get_battery_type(chip), soc, chip->qg_subtype,

			(chip->qg_version == QG_LITE) ? "QG_LITE" : "QG_PMIC5");

			(chip->qg_version == QG_LITE) ? "QG_LITE" : "QG_PMIC5",

			(chip->qg_mode == QG_V_I_MODE) ? "QG_V_I" : "QG_V");



	return rc;