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

Merge "input: touchpanel: fix wastes of time when resume and probe for ST's TP"

Browse source
This commit is contained in:
Linux Build Service Account 2017-08-03 20:51:13 -07:00 • committed by Gerrit - the friendly Code Review server
commit 607bbf6f9b
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/input/touchscreen/st/fts.c
View file

@ -1003,7 +1003,10 @@ static unsigned char *fts_status_event_handler(
case FTS_WATER_MODE_ON:
case FTS_WATER_MODE_OFF:
default:
logError(1, "%s %s Received unhandled status event = %02X %02X %02X %02X %02X %02X %02X %02X\n", tag, __func__, event[0], event[1], event[2], event[3], event[4], event[5], event[6], event[7]);
logError(0,
"%s %s Received unhandled status event = %02X %02X %02X %02X %02X %02X %02X %02X\n",
tag, __func__, event[0], event[1], event[2],
event[3], event[4], event[5], event[6], event[7]);
break;
}
@ -1755,8 +1758,6 @@ static int fts_fb_state_chg_callback(struct notifier_block *nb, unsigned long va
info->resume_bit = 1;
fts_system_reset();
fts_mode_handler(info, 0);
info->sensor_sleep = false;
@ -1959,9 +1960,9 @@ static int parse_dt(struct device *dev, struct fts_i2c_platform_data *bdata)
bdata->bus_reg_name = name;
logError(0, "%s bus_reg_name = %s\n", tag, name);
if (of_property_read_bool(np, "st, reset-gpio")) {
if (of_property_read_bool(np, "st,reset-gpio")) {
bdata->reset_gpio = of_get_named_gpio_flags(np,
"st, reset-gpio", 0, NULL);
"st,reset-gpio", 0, NULL);
logError(0, "%s reset_gpio =%d\n", tag, bdata->reset_gpio);
} else {
bdata->reset_gpio = GPIO_NOT_DEFINED;
@ -2210,7 +2211,13 @@ static int fts_probe(struct i2c_client *client,
}
#endif
queue_delayed_work(info->fwu_workqueue, &info->fwu_work, msecs_to_jiffies(EXP_FN_WORK_DELAY_MS));
/*if wanna auto-update FW when probe,
* please don't comment the following code
*/
/* queue_delayed_work(info->fwu_workqueue, &info->fwu_work,
* msecs_to_jiffies(EXP_FN_WORK_DELAY_MS));
*/
logError(1, "%s Probe Finished!\n", tag);
return OK;