Merge "power: qpnp-bms: use consistent IAVG for raw SOC calculation"

	return ocv_est_uv;

}

#define MIN_IAVG_MA 250

static void reset_for_new_battery(struct qpnp_bms_chip *chip, int batt_temp)

{

	chip->last_ocv_uv = chip->insertion_ocv_uv;

	chip->soc_at_cv = -EINVAL;

	chip->shutdown_soc_invalid = true;

	chip->shutdown_soc = 0;

	chip->shutdown_iavg_ma = 0;

	chip->shutdown_iavg_ma = MIN_IAVG_MA;

	chip->prev_pc_unusable = -EINVAL;

	reset_cc(chip, CLEAR_CC | CLEAR_SHDW_CC);

	chip->software_cc_uah = 0;

	max_percent_change = max(params->delta_time_s

				/ TIME_PER_PERCENT_UUC, 1);

	if (chip->prev_pc_unusable == -EINVAL

	if (chip->first_time_calc_uuc || chip->prev_pc_unusable == -EINVAL

		|| abs(chip->prev_pc_unusable - new_pc_unusable)

			<= max_percent_change) {

		chip->prev_pc_unusable = new_pc_unusable;

	return new_uuc_uah;

}

#define MIN_IAVG_MA 250

static int calculate_unusable_charge_uah(struct qpnp_bms_chip *chip,

					struct soc_params *params,

					int batt_temp)

	 * Do a quick run of SoC calculation to find whether the shutdown soc

	 * is close enough.

	 */

	chip->shutdown_iavg_ma = MIN_IAVG_MA;

	calculated_soc = recalculate_raw_soc(chip);

	shutdown_soc_out_of_limit = (abs(shutdown_soc - calculated_soc)

			> chip->shutdown_soc_valid_limit);