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

Commit fdfbf5ad authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: smb5-lib: Don't turn off the parallel charger on soft JEITA"

parents e28b72e6 94f26fee

drivers/power/supply/qcom/smb5-lib.c

+0 −14
Original line number Diff line number Diff line
@@ -3991,17 +3991,9 @@ static int smblib_soft_jeita_arb_wa(struct smb_charger *chg) 
	if (!chg->jeita_arb_flag && !soft_jeita)

		return 0;



	if (!chg->cp_disable_votable)

		chg->cp_disable_votable = find_votable("CP_DISABLE");



	/* Entering soft JEITA from normal state */

	if (!chg->jeita_arb_flag && soft_jeita) {

		vote(chg->chg_disable_votable, JEITA_ARB_VOTER, true, 0);

		/* Disable parallel charging */

		if (chg->pl_disable_votable)

			vote(chg->pl_disable_votable, JEITA_ARB_VOTER, true, 0);

		if (chg->cp_disable_votable)

			vote(chg->cp_disable_votable, JEITA_ARB_VOTER, true, 0);



		rc = smblib_charge_inhibit_en(chg, true);

		if (rc < 0)
@@ -4047,12 +4039,6 @@ static int smblib_soft_jeita_arb_wa(struct smb_charger *chg) 


		vote(chg->fcc_votable, JEITA_ARB_VOTER, false, 0);

		vote(chg->fv_votable, JEITA_ARB_VOTER, false, 0);

		if (chg->pl_disable_votable)

			vote(chg->pl_disable_votable, JEITA_ARB_VOTER, false,

				0);

		if (chg->cp_disable_votable)

			vote(chg->cp_disable_votable, JEITA_ARB_VOTER, false,

				0);

		vote(chg->chg_disable_votable, JEITA_ARB_VOTER, false, 0);

		chg->jeita_arb_flag = false;

	}