p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

regulator: twl-regulator: rework fixed regulator definition 

TWL603X and TWL4030 are different and have different code logic.
Rework the regulator definition method so we can split the file
easily in twl4030 and twl6030.

Signed-off-by: Nicolae Rosia <Nicolae_Rosia@mentor.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Nicolae Rosia 2016-11-12 14:42:14 +02:00 committed by Mark Brown
parent 1001354ca3
commit dab780a3b4
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -898,15 +898,6 @@ static struct regulator_ops twlsmps_ops = {
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
#define TWL4030_FIXED_LDO(label, offset, mVolts, num, turnon_delay, \
remap_conf) \
TWL_FIXED_LDO(label, offset, mVolts, num, turnon_delay, \
remap_conf, TWL4030, twl4030fixed_ops, \
twl4030reg_map_mode)
#define TWL6030_FIXED_LDO(label, offset, mVolts, turnon_delay) \
TWL_FIXED_LDO(label, offset, mVolts, 0x0, turnon_delay, \
0x0, TWL6030, twl6030fixed_ops, NULL)
#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 = { \
.base = offset, \ .base = offset, \
@ -983,8 +974,27 @@ static const struct twlreg_info TWL6032_INFO_##label = { \
}, \ }, \
} }
#define TWL_FIXED_LDO(label, offset, mVolts, num, turnon_delay, remap_conf, \ #define TWL6030_FIXED_LDO(label, offset, mVolts, turnon_delay) \
family, operations, map_mode) \ static const struct twlreg_info TWLFIXED_INFO_##label = { \
.base = offset, \
.id = 0, \
.min_mV = mVolts, \
.remap = 0, \
.desc = { \
.name = #label, \
.id = TWL6030##_REG_##label, \
.n_voltages = 1, \
.ops = &twl6030fixed_ops, \
.type = REGULATOR_VOLTAGE, \
.owner = THIS_MODULE, \
.min_uV = mVolts * 1000, \
.enable_time = turnon_delay, \
.of_map_mode = NULL, \
}, \
}
#define TWL4030_FIXED_LDO(label, offset, mVolts, num, turnon_delay, \
remap_conf) \
static const struct twlreg_info TWLFIXED_INFO_##label = { \ static const struct twlreg_info TWLFIXED_INFO_##label = { \
.base = offset, \ .base = offset, \
.id = num, \ .id = num, \
@ -992,14 +1002,14 @@ static const struct twlreg_info TWLFIXED_INFO_##label = { \
.remap = remap_conf, \ .remap = remap_conf, \
.desc = { \ .desc = { \
.name = #label, \ .name = #label, \
.id = family##_REG_##label, \ .id = TWL4030##_REG_##label, \
.n_voltages = 1, \ .n_voltages = 1, \
.ops = &operations, \ .ops = &twl4030fixed_ops, \
.type = REGULATOR_VOLTAGE, \ .type = REGULATOR_VOLTAGE, \
.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, \ .of_map_mode = twl4030reg_map_mode, \
}, \ }, \
} }