Skip to content

Commit

Permalink
twl-regulator: Add turnon delay to reg_enable
Browse files Browse the repository at this point in the history
This change implements a basic turnon delay in the regulator enable function
to make it less probable that reg_enable returns before the regulator
output is at target level

Signed-off-by: Juha Keski-Saari <ext-juha.1.keski-saari@nokia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  • Loading branch information
Juha Keski-Saari authored and Liam Girdwood committed Dec 17, 2009
1 parent 30010fa commit 53b8a9d
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion drivers/regulator/twl-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/err.h>
#include <linux/delay.h>
#include <linux/platform_device.h>
#include <linux/regulator/driver.h>
#include <linux/regulator/machine.h>
Expand Down Expand Up @@ -134,6 +135,7 @@ static int twlreg_enable(struct regulator_dev *rdev)
{
struct twlreg_info *info = rdev_get_drvdata(rdev);
int grp;
int ret;

grp = twlreg_read(info, TWL_MODULE_PM_RECEIVER, VREG_GRP);
if (grp < 0)
Expand All @@ -144,7 +146,11 @@ static int twlreg_enable(struct regulator_dev *rdev)
else
grp |= P1_GRP_6030;

return twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_GRP, grp);
ret = twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_GRP, grp);

udelay(info->delay);

return ret;
}

static int twlreg_disable(struct regulator_dev *rdev)
Expand Down

0 comments on commit 53b8a9d

Please sign in to comment.