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

Commit 51cf5ac9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "qcom: smb2: Disable parallel charging on qnovo charging below 2A" into msm-4.9

parents a477fdcc 67f19526

drivers/power/supply/qcom/qpnp-smb2.c

+2 −0
Original line number Diff line number Diff line
@@ -999,6 +999,8 @@ static int smb2_batt_set_prop(struct power_supply *psy, 
		break;

	case POWER_SUPPLY_PROP_CURRENT_QNOVO:

		chg->qnovo_fcc_ua = val->intval;

		vote(chg->pl_disable_votable, PL_QNOVO_VOTER,

			val->intval != -EINVAL && val->intval < 2000000, 0);

		rc = rerun_election(chg->fcc_votable);

		break;

	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:

drivers/power/supply/qcom/smb-lib.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ enum print_reason { 
#define USB_PSY_VOTER			"USB_PSY_VOTER"

#define PL_TAPER_WORK_RUNNING_VOTER	"PL_TAPER_WORK_RUNNING_VOTER"

#define PL_INDIRECT_VOTER		"PL_INDIRECT_VOTER"

#define PL_QNOVO_VOTER			"PL_QNOVO_VOTER"

#define USBIN_I_VOTER			"USBIN_I_VOTER"

#define USBIN_V_VOTER			"USBIN_V_VOTER"

#define CHG_STATE_VOTER			"CHG_STATE_VOTER"