summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOreste Salerno <oreste.salerno@tomtom.com>2016-01-27 13:58:38 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-01-27 14:32:49 -0800
commit8fb81d20019db3dea4126e3eac7ef8dc89b10b9e (patch)
tree3683206d6373795fa392dfd11fc13d37473b5bc4
parent707b61bba8b16adb6a2cbc72b71a75e09cb0f81a (diff)
Input: cyttsp - perform hard reset of the chip during probe
Since we removed support for calling an init() callback from the platform data, introduce a function which initializes the chip by performing a hard reset, using the reset gpio defined in the device properties. Signed-off-by: Oreste Salerno <oreste.salerno@tomtom.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/touchscreen/cyttsp_core.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/cyttsp_core.c b/drivers/input/touchscreen/cyttsp_core.c
index 8814b6c87097..91cda8f8119d 100644
--- a/drivers/input/touchscreen/cyttsp_core.c
+++ b/drivers/input/touchscreen/cyttsp_core.c
@@ -240,6 +240,16 @@ static int cyttsp_set_sysinfo_regs(struct cyttsp *ts)
return retval;
}
+static void cyttsp_hard_reset(struct cyttsp *ts)
+{
+ if (ts->reset_gpio) {
+ gpiod_set_value_cansleep(ts->reset_gpio, 1);
+ msleep(CY_DELAY_DFLT);
+ gpiod_set_value_cansleep(ts->reset_gpio, 0);
+ msleep(CY_DELAY_DFLT);
+ }
+}
+
static int cyttsp_soft_reset(struct cyttsp *ts)
{
unsigned long timeout;
@@ -666,6 +676,8 @@ struct cyttsp *cyttsp_probe(const struct cyttsp_bus_ops *bus_ops,
disable_irq(ts->irq);
+ cyttsp_hard_reset(ts);
+
error = cyttsp_power_on(ts);
if (error)
return ERR_PTR(error);