Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-31 01:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

regulator: twl: add twl6030 set_mode

Browse Source 
Current set_mode logic does not support 6030. The logic for 4030 is
not reusable for 6030 as the mode setting for 6030 now uses the new
CFG_STATE register. We hence rename the old get_status as being
specific to 4030.

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Saquib Herman <saquib@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@vega.(none)>
This commit is contained in:
Saquib Herman 2011-04-01 10:22:46 +05:30 committed by Liam Girdwood
parent 9a0244ad71
commit 1a39962fc4
1 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,15 +262,12 @@ static int twl6030reg_get_status(struct regulator_dev *rdev)
return REGULATOR_STATUS_OFF;
}
static int twlreg_set_mode(struct regulator_dev *rdev, unsigned mode)
static int twl4030reg_set_mode(struct regulator_dev *rdev, unsigned mode)
{
struct twlreg_info *info = rdev_get_drvdata(rdev);
unsigned message;
int status;
if (twl_class_is_6030())
return 0; /* FIXME return for 6030 regulator */
/* We can only set the mode through state machine commands... */
switch (mode) {
case REGULATOR_MODE_NORMAL:
@ -299,6 +296,35 @@ static int twlreg_set_mode(struct regulator_dev *rdev, unsigned mode)
message & 0xff, TWL4030_PM_MASTER_PB_WORD_LSB);
}
static int twl6030reg_set_mode(struct regulator_dev *rdev, unsigned mode)
{
struct twlreg_info *info = rdev_get_drvdata(rdev);
int grp;
int val;
grp = twlreg_read(info, TWL_MODULE_PM_RECEIVER, VREG_GRP);
if (grp < 0)
return grp;
/* Compose the state register settings */
val = grp << TWL6030_CFG_STATE_GRP_SHIFT;
/* We can only set the mode through state machine commands... */
switch (mode) {
case REGULATOR_MODE_NORMAL:
val |= TWL6030_CFG_STATE_ON;
break;
case REGULATOR_MODE_STANDBY:
val |= TWL6030_CFG_STATE_SLEEP;
break;
default:
return -EINVAL;
}
return twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_STATE, val);
}
/*----------------------------------------------------------------------*/
/*
@ -451,7 +477,7 @@ static struct regulator_ops twl4030ldo_ops = {
.disable = twlreg_disable,
.is_enabled = twl4030reg_is_enabled,
.set_mode = twlreg_set_mode,
.set_mode = twl4030reg_set_mode,
.get_status = twl4030reg_get_status,
};
@ -509,7 +535,7 @@ static struct regulator_ops twl6030ldo_ops = {
.disable = twlreg_disable,
.is_enabled = twl6030reg_is_enabled,
.set_mode = twlreg_set_mode,
.set_mode = twl6030reg_set_mode,
.get_status = twl6030reg_get_status,
};
@ -542,7 +568,7 @@ static struct regulator_ops twl4030fixed_ops = {
.disable = twlreg_disable,
.is_enabled = twl4030reg_is_enabled,
.set_mode = twlreg_set_mode,
.set_mode = twl4030reg_set_mode,
.get_status = twl4030reg_get_status,
};
@ -556,7 +582,7 @@ static struct regulator_ops twl6030fixed_ops = {
.disable = twlreg_disable,
.is_enabled = twl6030reg_is_enabled,
.set_mode = twlreg_set_mode,
.set_mode = twl6030reg_set_mode,
.get_status = twl6030reg_get_status,
};