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

Merge "battery: handle early/late suspend/resume of i2c bus"

Browse source
This commit is contained in:
Linux Build Service Account 2018-05-16 00:29:07 -07:00 • committed by Gerrit - the friendly Code Review server
commit ab1f87ea69
1 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,6 +58,7 @@ struct pl_data {
struct delayed_work status_change_work; struct delayed_work status_change_work;
struct work_struct pl_disable_forever_work; struct work_struct pl_disable_forever_work;
struct delayed_work pl_taper_work; struct delayed_work pl_taper_work;
struct delayed_work pl_awake_work;
struct power_supply *main_psy; struct power_supply *main_psy;
struct power_supply *pl_psy; struct power_supply *pl_psy;
struct power_supply *batt_psy; struct power_supply *batt_psy;
@ -640,6 +641,14 @@ static void pl_disable_forever_work(struct work_struct *work)
vote(chip->hvdcp_hw_inov_dis_votable, PL_VOTER, false, 0); vote(chip->hvdcp_hw_inov_dis_votable, PL_VOTER, false, 0);
} }
static void pl_awake_work(struct work_struct *work)
{
struct pl_data *chip = container_of(work,
struct pl_data, pl_awake_work.work);
vote(chip->pl_awake_votable, PL_VOTER, false, 0);
}
static int pl_disable_vote_callback(struct votable *votable, static int pl_disable_vote_callback(struct votable *votable,
void *data, int pl_disable, const char *client) void *data, int pl_disable, const char *client)
{ {
@ -652,6 +661,11 @@ static int pl_disable_vote_callback(struct votable *votable,
chip->pl_settled_ua = 0; chip->pl_settled_ua = 0;
if (!pl_disable) { /* enable */ if (!pl_disable) { /* enable */
/* keep system awake to talk to slave charger through i2c */
cancel_delayed_work_sync(&chip->pl_awake_work);
if (chip->pl_awake_votable)
vote(chip->pl_awake_votable, PL_VOTER, true, 0);
rc = power_supply_get_property(chip->pl_psy, rc = power_supply_get_property(chip->pl_psy,
POWER_SUPPLY_PROP_CHARGE_TYPE, &pval); POWER_SUPPLY_PROP_CHARGE_TYPE, &pval);
if (rc == -ENODEV) { if (rc == -ENODEV) {
@ -712,6 +726,11 @@ static int pl_disable_vote_callback(struct votable *votable,
} }
rerun_election(chip->fcc_votable); rerun_election(chip->fcc_votable);
rerun_election(chip->fv_votable); rerun_election(chip->fv_votable);
cancel_delayed_work_sync(&chip->pl_awake_work);
if (chip->pl_awake_votable)
schedule_delayed_work(&chip->pl_awake_work,
msecs_to_jiffies(5000));
} }
pl_dbg(chip, PR_PARALLEL, "parallel charging %s\n", pl_dbg(chip, PR_PARALLEL, "parallel charging %s\n",
@ -1098,6 +1117,7 @@ int qcom_batt_init(void)
INIT_DELAYED_WORK(&chip->status_change_work, status_change_work); INIT_DELAYED_WORK(&chip->status_change_work, status_change_work);
INIT_DELAYED_WORK(&chip->pl_taper_work, pl_taper_work); INIT_DELAYED_WORK(&chip->pl_taper_work, pl_taper_work);
INIT_WORK(&chip->pl_disable_forever_work, pl_disable_forever_work); INIT_WORK(&chip->pl_disable_forever_work, pl_disable_forever_work);
INIT_DELAYED_WORK(&chip->pl_awake_work, pl_awake_work);
rc = pl_register_notifier(chip); rc = pl_register_notifier(chip);
if (rc < 0) { if (rc < 0) {
@ -1151,6 +1171,7 @@ void qcom_batt_deinit(void)
cancel_delayed_work_sync(&chip->status_change_work); cancel_delayed_work_sync(&chip->status_change_work);
cancel_delayed_work_sync(&chip->pl_taper_work); cancel_delayed_work_sync(&chip->pl_taper_work);
cancel_work_sync(&chip->pl_disable_forever_work); cancel_work_sync(&chip->pl_disable_forever_work);
cancel_delayed_work_sync(&chip->pl_awake_work);
power_supply_unreg_notifier(&chip->nb); power_supply_unreg_notifier(&chip->nb);
destroy_votable(chip->pl_enable_votable_indirect); destroy_votable(chip->pl_enable_votable_indirect);