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

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

Merge "power: smblib: remove jeita fcc ajustment when HW jeita is disabled"

parents 76bd141e 0d18977d

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

+5 −0
Original line number Diff line number Diff line
@@ -3059,6 +3059,11 @@ int smblib_get_prop_fcc_delta(struct smb_charger *chg, 
{

	int rc, jeita_cc_delta_ua = 0;



	if (chg->sw_jeita_enabled) {

		val->intval = 0;

		return 0;

	}



	rc = smblib_get_jeita_cc_delta(chg, &jeita_cc_delta_ua);

	if (rc < 0) {

		smblib_err(chg, "Couldn't get jeita cc delta rc=%d\n", rc);

drivers/power/supply/qcom/step-chg-jeita.c

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static struct jeita_fcc_cfg jeita_fcc_config = { 
		/* TEMP_LOW	TEMP_HIGH	FCC */

		{0,		100,		600000},

		{101,		200,		2000000},

		{201,		450,		3000000},

		{201,		450,		3450000},

		{451,		550,		600000},

	},

};
@@ -135,7 +135,7 @@ static struct jeita_fv_cfg jeita_fv_config = { 
	.fv_cfg		= {

		/* TEMP_LOW	TEMP_HIGH	FCC */

		{0,		100,		4200000},

		{101,		450,		4400000},

		{101,		450,		4350000},

		{451,		550,		4200000},

	},

};