Merge "power: qpnp-charger: override DCIN_LLIMIT when Parallel charge is disabled" (7ca50354) · Commits · e / devices / android_kernel_sony_msm8994

drivers/power/qpnp-charger.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -1079,6 +1079,7 @@ switch_parallel_ovp_mode(struct qpnp_chg_chip *chip, bool enable)
		return rc;
		}

		if (enable)
		rc = override_dcin_ilimit(chip, 0);
		return rc;
		}
		@@ -5144,6 +5145,14 @@ qpnp_charger_probe(struct spmi_device *spmi)
		qpnp_chg_force_run_on_batt(chip, chip->charging_disabled);
		qpnp_chg_set_appropriate_vddmax(chip);

		if (chip->parallel_ovp_mode) {
		rc = override_dcin_ilimit(chip, 1);
		if (rc) {
		pr_err("Override DCIN LLIMIT %d\n", rc);
		goto unregister_dc_psy;
		}
		}

		rc = qpnp_chg_request_irqs(chip);
		if (rc) {
		pr_err("failed to request interrupts %d\n", rc);