UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

regulator: twl: Set enable enable_time in regulator_desc 

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-07-04 10:46:34 +08:00 committed by Mark Brown
parent 4b7c948f55
commit fca53d862d
1 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,9 +43,6 @@ struct twlreg_info {
u8 table_len; u8 table_len;
const u16 *table; const u16 *table;
/* regulator specific turn-on delay */
u16 delay;
/* State REMAP default configuration */ /* State REMAP default configuration */
u8 remap; u8 remap;
@ -223,20 +220,6 @@ static int twl6030reg_enable(struct regulator_dev *rdev)
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);
@ -508,7 +491,6 @@ 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,
@ -622,7 +604,6 @@ 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,7 +637,6 @@ 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,
@ -671,7 +651,6 @@ 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,
@ -682,7 +661,6 @@ 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,
}; };
@ -879,7 +857,6 @@ 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,
@ -902,7 +879,6 @@ static struct twlreg_info TWL4030_INFO_##label = { \
.id = num, \ .id = num, \
.table_len = ARRAY_SIZE(label##_VSEL_table), \ .table_len = ARRAY_SIZE(label##_VSEL_table), \
.table = label##_VSEL_table, \ .table = label##_VSEL_table, \
.delay = turnon_delay, \
.remap = remap_conf, \ .remap = remap_conf, \
.desc = { \ .desc = { \
.name = #label, \ .name = #label, \
@ -911,6 +887,7 @@ static struct twlreg_info TWL4030_INFO_##label = { \
.ops = &twl4030ldo_ops, \ .ops = &twl4030ldo_ops, \
.type = REGULATOR_VOLTAGE, \ .type = REGULATOR_VOLTAGE, \
.owner = THIS_MODULE, \ .owner = THIS_MODULE, \
.enable_time = turnon_delay, \
}, \ }, \
} }
@ -918,7 +895,6 @@ static struct twlreg_info TWL4030_INFO_##label = { \
static struct twlreg_info TWL4030_INFO_##label = { \ static struct twlreg_info TWL4030_INFO_##label = { \
.base = offset, \ .base = offset, \
.id = num, \ .id = num, \
.delay = turnon_delay, \
.remap = remap_conf, \ .remap = remap_conf, \
.desc = { \ .desc = { \
.name = #label, \ .name = #label, \
@ -926,6 +902,7 @@ static struct twlreg_info TWL4030_INFO_##label = { \
.ops = &twl4030smps_ops, \ .ops = &twl4030smps_ops, \
.type = REGULATOR_VOLTAGE, \ .type = REGULATOR_VOLTAGE, \
.owner = THIS_MODULE, \ .owner = THIS_MODULE, \
.enable_time = turnon_delay, \
}, \ }, \
} }
@ -980,7 +957,6 @@ static struct twlreg_info TWLFIXED_INFO_##label = { \
.base = offset, \ .base = offset, \
.id = num, \ .id = num, \
.min_mV = mVolts, \ .min_mV = mVolts, \
.delay = turnon_delay, \
.remap = remap_conf, \ .remap = remap_conf, \
.desc = { \ .desc = { \
.name = #label, \ .name = #label, \
@ -989,19 +965,20 @@ static struct twlreg_info TWLFIXED_INFO_##label = { \
.ops = &operations, \ .ops = &operations, \
.type = REGULATOR_VOLTAGE, \ .type = REGULATOR_VOLTAGE, \
.owner = THIS_MODULE, \ .owner = THIS_MODULE, \
.enable_time = turnon_delay, \
}, \ }, \
} }
#define TWL6030_FIXED_RESOURCE(label, offset, turnon_delay) \ #define TWL6030_FIXED_RESOURCE(label, offset, turnon_delay) \
static struct twlreg_info TWLRES_INFO_##label = { \ static struct twlreg_info TWLRES_INFO_##label = { \
.base = offset, \ .base = offset, \
.delay = turnon_delay, \
.desc = { \ .desc = { \
.name = #label, \ .name = #label, \
.id = TWL6030_REG_##label, \ .id = TWL6030_REG_##label, \
.ops = &twl6030_fixed_resource, \ .ops = &twl6030_fixed_resource, \
.type = REGULATOR_VOLTAGE, \ .type = REGULATOR_VOLTAGE, \
.owner = THIS_MODULE, \ .owner = THIS_MODULE, \
.enable_time = turnon_delay, \
}, \ }, \
} }