diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-19 17:17:32 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-19 17:17:32 +0000 |
| commit | 4992fa1fd425f1934f503ffa96b68e235b89db9a (patch) | |
| tree | 4710bcfe3eddc876c8243ff8fd8b5bca13946168 /include | |
| parent | 115e4bfd5bc68f870b3c889ab8f2d2733bcda452 (diff) | |
| parent | 46eda3e96a65b378041c79c51ff2e02009f7e2d0 (diff) | |
| download | linux-3.10-4992fa1fd425f1934f503ffa96b68e235b89db9a.tar.gz linux-3.10-4992fa1fd425f1934f503ffa96b68e235b89db9a.tar.bz2 linux-3.10-4992fa1fd425f1934f503ffa96b68e235b89db9a.zip | |
Merge tag 'topic/twl' into regulator-next
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')
| -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 78d3465251d..7fcab23c59c 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); |