|
@@ -387,6 +387,18 @@ static int twl4030reg_set_mode(struct regulator_dev *rdev, unsigned mode)
|
|
return twl4030_send_pb_msg(message);
|
|
return twl4030_send_pb_msg(message);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+static inline unsigned int twl4030reg_map_mode(unsigned int mode)
|
|
|
|
+{
|
|
|
|
+ switch (mode) {
|
|
|
|
+ case RES_STATE_ACTIVE:
|
|
|
|
+ return REGULATOR_MODE_NORMAL;
|
|
|
|
+ case RES_STATE_SLEEP:
|
|
|
|
+ return REGULATOR_MODE_STANDBY;
|
|
|
|
+ default:
|
|
|
|
+ return -EINVAL;
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
+
|
|
static int twl6030reg_set_mode(struct regulator_dev *rdev, unsigned mode)
|
|
static int twl6030reg_set_mode(struct regulator_dev *rdev, unsigned mode)
|
|
{
|
|
{
|
|
struct twlreg_info *info = rdev_get_drvdata(rdev);
|
|
struct twlreg_info *info = rdev_get_drvdata(rdev);
|
|
@@ -889,10 +901,11 @@ static struct regulator_ops twlsmps_ops = {
|
|
#define TWL4030_FIXED_LDO(label, offset, mVolts, num, turnon_delay, \
|
|
#define TWL4030_FIXED_LDO(label, offset, mVolts, num, turnon_delay, \
|
|
remap_conf) \
|
|
remap_conf) \
|
|
TWL_FIXED_LDO(label, offset, mVolts, num, turnon_delay, \
|
|
TWL_FIXED_LDO(label, offset, mVolts, num, turnon_delay, \
|
|
- remap_conf, TWL4030, twl4030fixed_ops)
|
|
|
|
|
|
+ remap_conf, TWL4030, twl4030fixed_ops, \
|
|
|
|
+ twl4030reg_map_mode)
|
|
#define TWL6030_FIXED_LDO(label, offset, mVolts, turnon_delay) \
|
|
#define TWL6030_FIXED_LDO(label, offset, mVolts, turnon_delay) \
|
|
TWL_FIXED_LDO(label, offset, mVolts, 0x0, turnon_delay, \
|
|
TWL_FIXED_LDO(label, offset, mVolts, 0x0, turnon_delay, \
|
|
- 0x0, TWL6030, twl6030fixed_ops)
|
|
|
|
|
|
+ 0x0, TWL6030, twl6030fixed_ops, 0x0)
|
|
|
|
|
|
#define TWL4030_ADJUSTABLE_LDO(label, offset, num, turnon_delay, remap_conf) \
|
|
#define TWL4030_ADJUSTABLE_LDO(label, offset, num, turnon_delay, remap_conf) \
|
|
static const struct twlreg_info TWL4030_INFO_##label = { \
|
|
static const struct twlreg_info TWL4030_INFO_##label = { \
|
|
@@ -909,6 +922,7 @@ static const struct twlreg_info TWL4030_INFO_##label = { \
|
|
.type = REGULATOR_VOLTAGE, \
|
|
.type = REGULATOR_VOLTAGE, \
|
|
.owner = THIS_MODULE, \
|
|
.owner = THIS_MODULE, \
|
|
.enable_time = turnon_delay, \
|
|
.enable_time = turnon_delay, \
|
|
|
|
+ .of_map_mode = twl4030reg_map_mode, \
|
|
}, \
|
|
}, \
|
|
}
|
|
}
|
|
|
|
|
|
@@ -924,6 +938,7 @@ static const struct twlreg_info TWL4030_INFO_##label = { \
|
|
.type = REGULATOR_VOLTAGE, \
|
|
.type = REGULATOR_VOLTAGE, \
|
|
.owner = THIS_MODULE, \
|
|
.owner = THIS_MODULE, \
|
|
.enable_time = turnon_delay, \
|
|
.enable_time = turnon_delay, \
|
|
|
|
+ .of_map_mode = twl4030reg_map_mode, \
|
|
}, \
|
|
}, \
|
|
}
|
|
}
|
|
|
|
|
|
@@ -969,7 +984,7 @@ static const struct twlreg_info TWL6032_INFO_##label = { \
|
|
}
|
|
}
|
|
|
|
|
|
#define TWL_FIXED_LDO(label, offset, mVolts, num, turnon_delay, remap_conf, \
|
|
#define TWL_FIXED_LDO(label, offset, mVolts, num, turnon_delay, remap_conf, \
|
|
- family, operations) \
|
|
|
|
|
|
+ family, operations, map_mode) \
|
|
static const struct twlreg_info TWLFIXED_INFO_##label = { \
|
|
static const struct twlreg_info TWLFIXED_INFO_##label = { \
|
|
.base = offset, \
|
|
.base = offset, \
|
|
.id = num, \
|
|
.id = num, \
|
|
@@ -984,6 +999,7 @@ static const struct twlreg_info TWLFIXED_INFO_##label = { \
|
|
.owner = THIS_MODULE, \
|
|
.owner = THIS_MODULE, \
|
|
.min_uV = mVolts * 1000, \
|
|
.min_uV = mVolts * 1000, \
|
|
.enable_time = turnon_delay, \
|
|
.enable_time = turnon_delay, \
|
|
|
|
+ .of_map_mode = map_mode, \
|
|
}, \
|
|
}, \
|
|
}
|
|
}
|
|
|
|
|