xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regulator: twl-regulator: Implement enable_time callback

Browse Source 
Let regulator core do the necessary delay for us.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin
2012-04-11 11:05:57 +08:00
committed by Mark Brown
parent 127ef6274a
commit 48c936d6da
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/regulator/twl-regulator.c
View File

@@ -205,8 +205,6 @@ static int twl4030reg_enable(struct regulator_dev *rdev)
ret = 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; return ret;
} }
@@ -224,12 +222,23 @@ static int twl6030reg_enable(struct regulator_dev *rdev)
ret = twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_STATE, ret = twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_STATE,
grp << TWL6030_CFG_STATE_GRP_SHIFT | grp << TWL6030_CFG_STATE_GRP_SHIFT |
TWL6030_CFG_STATE_ON); TWL6030_CFG_STATE_ON);
udelay(info->delay);
return ret; return ret;
} }
static int twl4030reg_enable_time(struct regulator_dev *rdev)
{
struct twlreg_info *info = rdev_get_drvdata(rdev);
return info->delay;
}
static int twl6030reg_enable_time(struct regulator_dev *rdev)
{
struct twlreg_info *info = rdev_get_drvdata(rdev);
return info->delay;
}
static int twl4030reg_disable(struct regulator_dev *rdev) static int twl4030reg_disable(struct regulator_dev *rdev)
{ {
struct twlreg_info *info = rdev_get_drvdata(rdev); struct twlreg_info *info = rdev_get_drvdata(rdev);
@@ -503,6 +512,7 @@ static struct regulator_ops twl4030ldo_ops = {
.enable = twl4030reg_enable, .enable = twl4030reg_enable,
.disable = twl4030reg_disable, .disable = twl4030reg_disable,
.is_enabled = twl4030reg_is_enabled, .is_enabled = twl4030reg_is_enabled,
.enable_time = twl4030reg_enable_time,
.set_mode = twl4030reg_set_mode, .set_mode = twl4030reg_set_mode,
@@ -623,6 +633,7 @@ static struct regulator_ops twl6030ldo_ops = {
.enable = twl6030reg_enable, .enable = twl6030reg_enable,
.disable = twl6030reg_disable, .disable = twl6030reg_disable,
.is_enabled = twl6030reg_is_enabled, .is_enabled = twl6030reg_is_enabled,
.enable_time = twl6030reg_enable_time,
.set_mode = twl6030reg_set_mode, .set_mode = twl6030reg_set_mode,
@@ -656,6 +667,7 @@ static struct regulator_ops twl4030fixed_ops = {
.enable = twl4030reg_enable, .enable = twl4030reg_enable,
.disable = twl4030reg_disable, .disable = twl4030reg_disable,
.is_enabled = twl4030reg_is_enabled, .is_enabled = twl4030reg_is_enabled,
.enable_time = twl4030reg_enable_time,
.set_mode = twl4030reg_set_mode, .set_mode = twl4030reg_set_mode,
@@ -670,6 +682,7 @@ static struct regulator_ops twl6030fixed_ops = {
.enable = twl6030reg_enable, .enable = twl6030reg_enable,
.disable = twl6030reg_disable, .disable = twl6030reg_disable,
.is_enabled = twl6030reg_is_enabled, .is_enabled = twl6030reg_is_enabled,
.enable_time = twl6030reg_enable_time,
.set_mode = twl6030reg_set_mode, .set_mode = twl6030reg_set_mode,
@@ -680,6 +693,7 @@ static struct regulator_ops twl6030_fixed_resource = {
.enable = twl6030reg_enable, .enable = twl6030reg_enable,
.disable = twl6030reg_disable, .disable = twl6030reg_disable,
.is_enabled = twl6030reg_is_enabled, .is_enabled = twl6030reg_is_enabled,
.enable_time = twl6030reg_enable_time,
.get_status = twl6030reg_get_status, .get_status = twl6030reg_get_status,
}; };
@@ -876,6 +890,7 @@ static struct regulator_ops twlsmps_ops = {
.enable = twl6030reg_enable, .enable = twl6030reg_enable,
.disable = twl6030reg_disable, .disable = twl6030reg_disable,
.is_enabled = twl6030reg_is_enabled, .is_enabled = twl6030reg_is_enabled,
.enable_time = twl6030reg_enable_time,
.set_mode = twl6030reg_set_mode, .set_mode = twl6030reg_set_mode,