Merge "power: qpnp-bms: calibrate iadc using correct batfet settings" (6b2b818f) · Commits · e / devices / android_kernel_sony_msm8994

drivers/power/qpnp-bms.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -2519,7 +2519,7 @@ static int recalculate_raw_soc(struct qpnp_bms_chip *chip)
		soc = calculate_soc_from_voltage(chip);
		} else {
		if (!chip->batfet_closed)
		qpnp_iadc_calibrate_for_trim(chip->iadc_dev, true);
		qpnp_iadc_calibrate_for_trim(chip->iadc_dev, false);
		rc = qpnp_vadc_read(chip->vadc_dev, LR_MUX1_BATT_THERM,
		&result);
		if (rc) {
		@@ -2571,7 +2571,7 @@ static int recalculate_soc(struct qpnp_bms_chip *chip)
		soc = calculate_soc_from_voltage(chip);
		} else {
		if (!chip->batfet_closed)
		qpnp_iadc_calibrate_for_trim(chip->iadc_dev, true);
		qpnp_iadc_calibrate_for_trim(chip->iadc_dev, false);
		rc = qpnp_vadc_read(chip->vadc_dev, LR_MUX1_BATT_THERM,
		&result);
		if (rc) {
		@@ -3296,12 +3296,11 @@ static void batfet_status_check(struct qpnp_bms_chip *chip)
		{
		bool batfet_closed;

		if (chip->iadc_bms_revision2 > CALIB_WRKARND_DIG_MAJOR_MAX)
		return;

		batfet_closed = is_batfet_closed(chip);
		if (chip->batfet_closed != batfet_closed) {
		chip->batfet_closed = batfet_closed;
		if (chip->iadc_bms_revision2 > CALIB_WRKARND_DIG_MAJOR_MAX)
		return;
		if (batfet_closed == false) {
		/* batfet opened */
		schedule_work(&chip->batfet_open_work);