summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2012-05-17 01:49:32 +0530
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-05-18 00:29:14 -0700
commitb0580d28e1d44cf1a501279a08290da803c9f978 (patch)
tree7ca2ee3b2e0efd5c76126439ce4b86071bb181e4 /drivers/regulator
parenta4d60323addfc7748f9a74d7efc8d27f86181c9b (diff)
regulator: tps6238x0: enable output discharge always
Enable output discharge always to have faster ramp-down time. bug 981330 Change-Id: I0a00ab38e9be631a58bc8b11148be5c3c508d119 Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-on: http://git-master/r/102882 Reviewed-by: Automatic_Commit_Validation_User Tested-by: Pradeep Goudagunta <pgoudagunta@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/tps6238x0-regulator.c22
1 files changed, 2 insertions, 20 deletions
diff --git a/drivers/regulator/tps6238x0-regulator.c b/drivers/regulator/tps6238x0-regulator.c
index 880249627ab6..611b9425a263 100644
--- a/drivers/regulator/tps6238x0-regulator.c
+++ b/drivers/regulator/tps6238x0-regulator.c
@@ -62,7 +62,6 @@ struct tps6238x0_chip {
int vsel_gpio;
int change_uv_per_us;
bool en_internal_pulldn;
- bool en_discharge;
bool valid_gpios;
int lru_index[TPS6238X0_MAX_VSET];
int curr_vset_vsel[TPS6238X0_MAX_VSET];
@@ -304,8 +303,8 @@ static int __devinit tps6238x0_configure(struct tps6238x0_chip *tps,
}
}
- /* Reset output discharge path to reduce power consumption */
- ret = regmap_update_bits(tps->regmap, REG_RAMPCTRL, BIT(2), 0);
+ /* Enable output discharge path to have faster discharge */
+ ret = regmap_update_bits(tps->regmap, REG_RAMPCTRL, BIT(2), BIT(2));
if (ret < 0)
dev_err(tps->dev, "%s() fails in updating reg %d\n",
__func__, REG_RAMPCTRL);
@@ -344,7 +343,6 @@ static int __devinit tps6238x0_probe(struct i2c_client *client,
return -ENOMEM;
}
- tps->en_discharge = pdata->en_discharge;
tps->en_internal_pulldn = pdata->en_internal_pulldn;
tps->vsel_gpio = pdata->vsel_gpio;
tps->dev = &client->dev;
@@ -436,21 +434,6 @@ static int __devexit tps6238x0_remove(struct i2c_client *client)
return 0;
}
-static void tps6238x0_shutdown(struct i2c_client *client)
-{
- struct tps6238x0_chip *tps = i2c_get_clientdata(client);
- int st;
-
- if (!tps->en_discharge)
- return;
-
- /* Configure the output discharge path */
- st = regmap_update_bits(tps->regmap, REG_RAMPCTRL, BIT(2), BIT(2));
- if (st < 0)
- dev_err(tps->dev, "%s() fails in updating reg %d\n",
- __func__, REG_RAMPCTRL);
-}
-
static const struct i2c_device_id tps6238x0_id[] = {
{.name = "tps623850", },
{.name = "tps623860", },
@@ -467,7 +450,6 @@ static struct i2c_driver tps6238x0_i2c_driver = {
},
.probe = tps6238x0_probe,
.remove = __devexit_p(tps6238x0_remove),
- .shutdown = tps6238x0_shutdown,
.id_table = tps6238x0_id,
};