A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 12:58:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

sec_mmi: enforce charger detection option

Browse source 
Make sure all charger detection code only executed when option is
enabled in device tree.

Change-Id: I1f195947313a874d534d8ea89833c17ec4ee6ee6
Signed-off-by: Konstantin Makariev <hcv867@motorola.com>
Reviewed-on: https://gerrit.mot.com/1424713
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Konstantin Makariev <kmakariev@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
Konstantin Makariev 2019-09-19 08:42:10 -05:00 • committed by Konstantin Makariev
commit 635eb460c4
1 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
drivers/input/touchscreen/sec_mmi/sec_ts_mmi.c
View file

@ -557,21 +557,23 @@ static void sec_mmi_work(struct work_struct *w)
}
if (ts->fw_invalid == false) {
struct power_supply *psy;
sec_mmi_fw_read_id(data);
sec_ts_integrity_check(ts);
psy = power_supply_get_by_name("usb");
if (psy) {
int rc;
rc = sec_mmi_ps_get_state(psy, &data->ps_is_present);
if (rc) {
dev_err(DEV_MMI, "%s: failed to get usb status\n", __func__);
}
if (data->usb_detection) {
struct power_supply *psy;
if (data->ps_is_present)
sec_ts_set_charger(ts, data->ps_is_present);
psy = power_supply_get_by_name("usb");
if (psy) {
int rc;
rc = sec_mmi_ps_get_state(psy, &data->ps_is_present);
if (rc) {
dev_err(DEV_MMI,
"%s: failed to get usb status\n", __func__);
}
if (data->ps_is_present)
sec_ts_set_charger(ts, data->ps_is_present);
}
}
sec_ts_sense_on(ts);
@ -623,7 +625,7 @@ static void sec_mmi_queued_resume(struct work_struct *w)
}
/* make sure charger mode is properly set after reset */
if (update_charger)
if (data->usb_detection && update_charger)
schedule_work(&data->ps_notify_work);
if (ts->lowpower_mode)
@ -1148,7 +1150,8 @@ int sec_mmi_data_init(struct sec_ts_data *ts, bool enable)
#endif
INIT_DELAYED_WORK(&data->resume_work, sec_mmi_queued_resume);
INIT_DELAYED_WORK(&data->detection_work, sec_mmi_work);
INIT_WORK(&data->ps_notify_work, sec_mmi_ps_work);
if (data->usb_detection)
INIT_WORK(&data->ps_notify_work, sec_mmi_ps_work);
schedule_delayed_work(&data->detection_work, msecs_to_jiffies(50));
}