Merge "input: touchscreen: add delay after enabling regulators"

This commit is contained in:
Linux Build Service Account 2016-08-04 21:39:40 -07:00 committed by Gerrit - the friendly Code Review server
commit bf02aa69f5

View file

@ -128,6 +128,7 @@
#define IT_I2C_VTG_MIN_UV 2600000 #define IT_I2C_VTG_MIN_UV 2600000
#define IT_I2C_VTG_MAX_UV 3300000 #define IT_I2C_VTG_MAX_UV 3300000
#define IT_I2C_ACTIVE_LOAD_UA 10000 #define IT_I2C_ACTIVE_LOAD_UA 10000
#define DELAY_VTG_REG_EN 170
#define PINCTRL_STATE_ACTIVE "pmx_ts_active" #define PINCTRL_STATE_ACTIVE "pmx_ts_active"
#define PINCTRL_STATE_SUSPEND "pmx_ts_suspend" #define PINCTRL_STATE_SUSPEND "pmx_ts_suspend"
@ -1619,6 +1620,12 @@ static int IT7260_ts_probe(struct i2c_client *client,
goto err_power_device; goto err_power_device;
} }
/*
* After enabling regulators, controller needs a delay to come to
* an active state.
*/
msleep(DELAY_VTG_REG_EN);
ret = IT7260_ts_pinctrl_init(gl_ts); ret = IT7260_ts_pinctrl_init(gl_ts);
if (!ret && gl_ts->ts_pinctrl) { if (!ret && gl_ts->ts_pinctrl) {
/* /*