summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-08-04 21:39:40 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-08-04 21:39:39 -0700
commitbf02aa69f520feda7ca96c9e7c4d58a0b280b98d (patch)
treeceeff91a0cad6115b49b26bcaf40a19d166e8189
parent70683f96aab37a16e8954225d8f8412e535e6c96 (diff)
parent7233392578f916e3f56bd5cab3578bdb43bf7798 (diff)
Merge "input: touchscreen: add delay after enabling regulators"
-rw-r--r--drivers/input/touchscreen/it7258_ts_i2c.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/it7258_ts_i2c.c b/drivers/input/touchscreen/it7258_ts_i2c.c
index 1fa28f1f0d9d..5f1da30ecd88 100644
--- a/drivers/input/touchscreen/it7258_ts_i2c.c
+++ b/drivers/input/touchscreen/it7258_ts_i2c.c
@@ -128,6 +128,7 @@
#define IT_I2C_VTG_MIN_UV 2600000
#define IT_I2C_VTG_MAX_UV 3300000
#define IT_I2C_ACTIVE_LOAD_UA 10000
+#define DELAY_VTG_REG_EN 170
#define PINCTRL_STATE_ACTIVE "pmx_ts_active"
#define PINCTRL_STATE_SUSPEND "pmx_ts_suspend"
@@ -1619,6 +1620,12 @@ static int IT7260_ts_probe(struct i2c_client *client,
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);
if (!ret && gl_ts->ts_pinctrl) {
/*