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

Commit 30f84ecd authored by Ashay Jaiswal's avatar Ashay Jaiswal
Browse files

power: qpnp-smbcharger: Force input current limiting during pulsing 



Force input current limit to 300mA during QC3.0 DP/DM pulsing for PMI8950.
While at it, update the error handling during pulsing to force 9V QC2.0
in case of failure.

CRs-Fixed: 984187
Change-Id: I7d48ff9fb4505dae1ed231691ba8efcd845df27c
Signed-off-by: default avatarAshay Jaiswal <ashayj@codeaurora.org>
parent 5475e84f

drivers/power/qpnp-smbcharger.c

+20 −12
Original line number Diff line number Diff line
@@ -4551,11 +4551,6 @@ static void restore_from_hvdcp_detection(struct smbchg_chip *chip) 
{

	int rc;



	pr_smb(PR_MISC, "Retracting HVDCP vote for ICL\n");

	rc = vote(chip->usb_icl_votable, HVDCP_ICL_VOTER, false, 0);

	if (rc < 0)

		pr_err("Couldn't retract HVDCP ICL vote rc=%d\n", rc);



	/* switch to 9V HVDCP */

	rc = smbchg_sec_masked_write(chip, chip->usb_chgpth_base + CHGPTH_CFG,

				HVDCP_ADAPTER_SEL_MASK, HVDCP_9V);
@@ -4590,6 +4585,19 @@ static void restore_from_hvdcp_detection(struct smbchg_chip *chip) 


	chip->hvdcp_3_det_ignore_uv = false;

	chip->pulse_cnt = 0;



	if ((chip->schg_version == QPNP_SCHG_LITE)

				&& is_hvdcp_present(chip)) {

		pr_smb(PR_MISC, "Forcing 9V HVDCP 2.0\n");

		rc = force_9v_hvdcp(chip);

		if (rc)

			pr_err("Failed to force 9V HVDCP=%d\n",	rc);

	}



	pr_smb(PR_MISC, "Retracting HVDCP vote for ICL\n");

	rc = vote(chip->usb_icl_votable, HVDCP_ICL_VOTER, false, 0);

	if (rc < 0)

		pr_err("Couldn't retract HVDCP ICL vote rc=%d\n", rc);

}



#define RESTRICTED_CHG_FCC_PERCENT	50
@@ -5354,6 +5362,13 @@ static int smbchg_prepare_for_pulsing_lite(struct smbchg_chip *chip) 
{

	int rc = 0;



	pr_smb(PR_MISC, "HVDCP voting for 300mA ICL\n");

	rc = vote(chip->usb_icl_votable, HVDCP_ICL_VOTER, true, 300);

	if (rc < 0) {

		pr_err("Couldn't vote for 300mA HVDCP ICL rc=%d\n", rc);

		return rc;

	}



	/* check if HVDCP is already in 5V continuous mode */

	if (is_hvdcp_5v_cont_mode(chip)) {

		pr_smb(PR_MISC, "HVDCP by default is in 5V continuous mode\n");
@@ -5380,13 +5395,6 @@ static int smbchg_prepare_for_pulsing_lite(struct smbchg_chip *chip) 
		goto out;

	}



	pr_smb(PR_MISC, "HVDCP voting for 300mA ICL\n");

	rc = vote(chip->usb_icl_votable, HVDCP_ICL_VOTER, true, 300);

	if (rc < 0) {

		pr_err("Couldn't vote for 300mA HVDCP ICL rc=%d\n", rc);

		goto out;

	}



	pr_smb(PR_MISC, "Disable AICL\n");

	smbchg_sec_masked_write(chip, chip->usb_chgpth_base + USB_AICL_CFG,

			AICL_EN_BIT, 0);