Merge "power: qpnp-smbcharger: reenable AICL if prepare fails" (362917e3) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/power/qpnp-smbcharger.c

+10 −6

Original line number	Diff line number	Diff line
		@@ -3875,7 +3875,6 @@ static void restore_from_hvdcp_detection(struct smbchg_chip *chip)
		int rc;

		/* switch to 9V HVDCP */
		pr_smb(PR_MISC, "Switch to 9V HVDCP\n");
		rc = smbchg_sec_masked_write(chip, chip->usb_chgpth_base + CHGPTH_CFG,
		HVDCP_ADAPTER_SEL_MASK, HVDCP_9V);
		if (rc < 0)
		@@ -3902,6 +3901,11 @@ static void restore_from_hvdcp_detection(struct smbchg_chip *chip)
		if (rc < 0)
		pr_err("Couldn't write usb allowance rc=%d\n", rc);

		rc = smbchg_sec_masked_write(chip, chip->usb_chgpth_base + USB_AICL_CFG,
		AICL_EN_BIT, AICL_EN_BIT);
		if (rc < 0)
		pr_err("Couldn't enable AICL rc=%d\n", rc);

		chip->hvdcp_3_det_ignore_uv = false;
		chip->pulse_cnt = 0;
		}
		@@ -5313,14 +5317,14 @@ static irqreturn_t src_detect_handler(int irq, void *_chip)
		* instead of the USBIN_UV handler since the latter is untrustworthy
		* when the battery voltage is high.
		*/
		chip->very_weak_charger = false;
		rc = smbchg_primary_usb_en(chip, true, REASON_WEAK_CHARGER, &unused);
		if (rc < 0)
		pr_err("could not enable charger: %d\n", rc);

		if (src_detect) {
		update_usb_status(chip, usb_present, 0);
		} else {
		chip->very_weak_charger = false;
		rc = smbchg_primary_usb_en(chip, true,
		REASON_WEAK_CHARGER, &unused);
		if (rc)
		pr_err("could not enable charger: %d", rc);
		update_usb_status(chip, 0, false);
		chip->aicl_irq_count = 0;
		}