diff options
| author | Kevin Hilman <khilman@ti.com> | 2012-03-13 02:36:23 +0400 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2012-03-13 02:36:23 +0400 |
| commit | 05d164c9b546fb02b079e2a398b16ea4466e9615 (patch) | |
| tree | d4af5540d9e3b33036333cbae9796e536f07f4f7 /include/linux | |
| parent | b01543dfe67bb1d191998e90d20534dc354de059 (diff) | |
| parent | 46eda3e96a65b378041c79c51ff2e02009f7e2d0 (diff) | |
| download | linux-05d164c9b546fb02b079e2a398b16ea4466e9615.tar.xz | |
Merge tag 'topic/twl' into for_3.4/pm/smps-regulator
TWL specific changes, cross-merged with OMAP due to arch/arm wanting to
use the new ability to override the voltage set and get operations to
support the in-CPU voltage management. The other changes are minor
fixes, the addition of a few new regulators and device tree support.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/i2c/twl.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index 78d3465251d6..7fcab23c59ce 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h @@ -712,6 +712,9 @@ struct twl4030_platform_data { struct regulator_init_data *vaux1; struct regulator_init_data *vaux2; struct regulator_init_data *vaux3; + struct regulator_init_data *vdd1; + struct regulator_init_data *vdd2; + struct regulator_init_data *vdd3; /* TWL4030 LDO regulators */ struct regulator_init_data *vpll1; struct regulator_init_data *vpll2; @@ -720,8 +723,6 @@ struct twl4030_platform_data { struct regulator_init_data *vsim; struct regulator_init_data *vaux4; struct regulator_init_data *vio; - struct regulator_init_data *vdd1; - struct regulator_init_data *vdd2; struct regulator_init_data *vintana1; struct regulator_init_data *vintana2; struct regulator_init_data *vintdig; @@ -733,6 +734,8 @@ struct twl4030_platform_data { struct regulator_init_data *vcxio; struct regulator_init_data *vusb; struct regulator_init_data *clk32kg; + struct regulator_init_data *v1v8; + struct regulator_init_data *v2v1; /* TWL6025 LDO regulators */ struct regulator_init_data *ldo1; struct regulator_init_data *ldo2; @@ -749,6 +752,13 @@ struct twl4030_platform_data { struct regulator_init_data *vio6025; }; +struct twl_regulator_driver_data { + int (*set_voltage)(void *data, int target_uV); + int (*get_voltage)(void *data); + void *data; + unsigned long features; +}; + /*----------------------------------------------------------------------*/ int twl4030_sih_setup(int module); |