evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "supply: qcom: battery: re-split FCC when ICL changes"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-23 21:35:53 -08:00 • committed by Gerrit - the friendly Code Review server
commit 9c2a8d5241
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/power/supply/qcom/battery.c
View file

@ -635,14 +635,16 @@ static void handle_main_charge_type(struct pl_data *chip)
} }
#define MIN_ICL_CHANGE_DELTA_UA 300000 #define MIN_ICL_CHANGE_DELTA_UA 300000
static void handle_settled_aicl_split(struct pl_data *chip) static void handle_settled_icl_change(struct pl_data *chip)
{ {
union power_supply_propval pval = {0, }; union power_supply_propval pval = {0, };
int rc; int rc;
if (!get_effective_result(chip->pl_disable_votable) if (get_effective_result(chip->pl_disable_votable))
&& (chip->pl_mode == POWER_SUPPLY_PL_USBIN_USBIN return;
|| chip->pl_mode == POWER_SUPPLY_PL_USBIN_USBIN_EXT)) {
if (chip->pl_mode == POWER_SUPPLY_PL_USBIN_USBIN
|| chip->pl_mode == POWER_SUPPLY_PL_USBIN_USBIN_EXT) {
/* /*
* call aicl split only when USBIN_USBIN and enabled * call aicl split only when USBIN_USBIN and enabled
* and if aicl changed * and if aicl changed
@ -659,6 +661,8 @@ static void handle_settled_aicl_split(struct pl_data *chip)
if (abs((chip->main_settled_ua - chip->pl_settled_ua) if (abs((chip->main_settled_ua - chip->pl_settled_ua)
- pval.intval) > MIN_ICL_CHANGE_DELTA_UA) - pval.intval) > MIN_ICL_CHANGE_DELTA_UA)
split_settled(chip); split_settled(chip);
} else {
rerun_election(chip->fcc_votable);
} }
} }
@ -705,7 +709,7 @@ static void status_change_work(struct work_struct *work)
is_parallel_available(chip); is_parallel_available(chip);
handle_main_charge_type(chip); handle_main_charge_type(chip);
handle_settled_aicl_split(chip); handle_settled_icl_change(chip);
handle_parallel_in_taper(chip); handle_parallel_in_taper(chip);
} }
@ -719,7 +723,8 @@ static int pl_notifier_call(struct notifier_block *nb,
return NOTIFY_OK; return NOTIFY_OK;
if ((strcmp(psy->desc->name, "parallel") == 0) if ((strcmp(psy->desc->name, "parallel") == 0)
|| (strcmp(psy->desc->name, "battery") == 0)) || (strcmp(psy->desc->name, "battery") == 0)
|| (strcmp(psy->desc->name, "main") == 0))
schedule_work(&chip->status_change_work); schedule_work(&chip->status_change_work);
return NOTIFY_OK; return NOTIFY_OK;