diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-02-28 04:39:13 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-11 16:09:26 -0400 |
| commit | 46eda3e96a65b378041c79c51ff2e02009f7e2d0 (patch) | |
| tree | 92a50ac1a12e660240a60c55510fd4b2d8a2d424 | |
| parent | e9d47fa4ebb9382bc3282fc13ad28a4e2a1a089e (diff) | |
mfd: twl-core: regulator configuration for twl6030 V1V8, V2V1 SMPS
To be able to attach consumers to these supplies from board
files we need to have regulator_init_data for them.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| -rw-r--r-- | drivers/mfd/twl-core.c | 10 | ||||
| -rw-r--r-- | include/linux/i2c/twl.h | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index c788e363ed56..d3cf5e8c1d02 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c | |||
| @@ -964,6 +964,16 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) | |||
| 964 | if (IS_ERR(child)) | 964 | if (IS_ERR(child)) |
| 965 | return PTR_ERR(child); | 965 | return PTR_ERR(child); |
| 966 | 966 | ||
| 967 | child = add_regulator(TWL6030_REG_V1V8, pdata->v1v8, | ||
| 968 | features); | ||
| 969 | if (IS_ERR(child)) | ||
| 970 | return PTR_ERR(child); | ||
| 971 | |||
| 972 | child = add_regulator(TWL6030_REG_V2V1, pdata->v2v1, | ||
| 973 | features); | ||
| 974 | if (IS_ERR(child)) | ||
| 975 | return PTR_ERR(child); | ||
| 976 | |||
| 967 | child = add_regulator(TWL6030_REG_VMMC, pdata->vmmc, | 977 | child = add_regulator(TWL6030_REG_VMMC, pdata->vmmc, |
| 968 | features); | 978 | features); |
| 969 | if (IS_ERR(child)) | 979 | if (IS_ERR(child)) |
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index f66c0311e448..7fcab23c59ce 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h | |||
| @@ -734,6 +734,8 @@ struct twl4030_platform_data { | |||
| 734 | struct regulator_init_data *vcxio; | 734 | struct regulator_init_data *vcxio; |
| 735 | struct regulator_init_data *vusb; | 735 | struct regulator_init_data *vusb; |
| 736 | struct regulator_init_data *clk32kg; | 736 | struct regulator_init_data *clk32kg; |
| 737 | struct regulator_init_data *v1v8; | ||
| 738 | struct regulator_init_data *v2v1; | ||
| 737 | /* TWL6025 LDO regulators */ | 739 | /* TWL6025 LDO regulators */ |
| 738 | struct regulator_init_data *ldo1; | 740 | struct regulator_init_data *ldo1; |
| 739 | struct regulator_init_data *ldo2; | 741 | struct regulator_init_data *ldo2; |
