summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjung <djung@nvidia.com>2014-06-24 14:08:36 -0700
committerHarry Hong <hhong@nvidia.com>2014-07-07 18:33:39 -0700
commit080b0dfd26afab4e4726778e381070ad0ec255bd (patch)
treefa03a50e90314a0863d8dd078666497f15f2c66c
parentca1c054fe0df9da0e4fe828a69e3ed75f9befa7b (diff)
input: touch: maxim: update avdd to 3.3V
Nvidia changes to update Maxim touch AVDD voltage setting. Bug 1522154 Bug 200006060 Bug 1522162 Bug 1444604 Bug 1493749 Change-Id: I8a6d349fe9ceead294505597155e9fbb1323e1af Signed-off-by: djung <djung@nvidia.com> Reviewed-on: http://git-master/r/427871 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Harry Hong <hhong@nvidia.com>
-rw-r--r--drivers/input/touchscreen/maxim_sti.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/maxim_sti.c b/drivers/input/touchscreen/maxim_sti.c
index ac0ddf959880..ef89f95e99ea 100644
--- a/drivers/input/touchscreen/maxim_sti.c
+++ b/drivers/input/touchscreen/maxim_sti.c
@@ -1765,6 +1765,10 @@ static int probe(struct spi_device *spi)
goto platform_failure;
/* power-up and reset-high */
+ pdata->reset(pdata, 0);
+ ret = regulator_set_voltage(dd->reg_avdd, 3000000, 3000000);
+ if (ret < 0)
+ INFO("Touch avdd regulator not set: %d", ret);
ret = regulator_control(dd, true);
if (ret < 0)
goto platform_failure;
@@ -1834,6 +1838,26 @@ static int probe(struct spi_device *spi)
/* start up Touch Fusion */
dd->start_fusion = true;
wake_up_process(dd->thread);
+
+ msleep(2250);
+ ret = regulator_set_voltage(dd->reg_avdd, 3300000, 3300000);
+ if (ret < 0)
+ INFO("Touch avdd regulator not set 3.3V: %d", ret);
+ usleep_range(15000, 20000);
+
+ /* reset-low and power-down */
+ pdata->reset(pdata, 0);
+ usleep_range(100, 120);
+ ret = regulator_control(dd, false);
+
+ msleep(750);
+
+ /* power-up and reset-high */
+ pdata->reset(pdata, 0);
+ ret = regulator_control(dd, true);
+ usleep_range(300, 400);
+ pdata->reset(pdata, 1);
+
INFO("driver loaded; version %s; release date %s", DRIVER_VERSION,
DRIVER_RELEASE);