diff options
author | Tero Kristo <t-kristo@ti.com> | 2012-02-28 04:39:10 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-11 16:09:00 -0400 |
commit | 34a38440689b06a515104d668494e0ff8a4e1537 (patch) | |
tree | b6ea0840779978b209a11eeaedc0575080d57885 /drivers/mfd | |
parent | 63bfff4e20211b464cbea6e79e5fd36df227c154 (diff) |
regulator: twl6030: add support for vdd1, vdd2 and vdd3 regulators
vdd1 and vdd2 are now common regulators for twl4030 and twl6030. Also
added vdd3 as a new regulator for twl6030. twl6030 vdd1...vdd3 smps
regulator voltages can only be controlled through the smartreflex
voltage channel, thus the support for the voltage_get and set is
minimal and requires external controller.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/twl-core.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index fae5f76d6ccb..c788e363ed56 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c | |||
@@ -949,6 +949,21 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) | |||
949 | /* twl6030 regulators */ | 949 | /* twl6030 regulators */ |
950 | if (twl_has_regulator() && twl_class_is_6030() && | 950 | if (twl_has_regulator() && twl_class_is_6030() && |
951 | !(features & TWL6025_SUBCLASS)) { | 951 | !(features & TWL6025_SUBCLASS)) { |
952 | child = add_regulator(TWL6030_REG_VDD1, pdata->vdd1, | ||
953 | features); | ||
954 | if (IS_ERR(child)) | ||
955 | return PTR_ERR(child); | ||
956 | |||
957 | child = add_regulator(TWL6030_REG_VDD2, pdata->vdd2, | ||
958 | features); | ||
959 | if (IS_ERR(child)) | ||
960 | return PTR_ERR(child); | ||
961 | |||
962 | child = add_regulator(TWL6030_REG_VDD3, pdata->vdd3, | ||
963 | features); | ||
964 | if (IS_ERR(child)) | ||
965 | return PTR_ERR(child); | ||
966 | |||
952 | child = add_regulator(TWL6030_REG_VMMC, pdata->vmmc, | 967 | child = add_regulator(TWL6030_REG_VMMC, pdata->vmmc, |
953 | features); | 968 | features); |
954 | if (IS_ERR(child)) | 969 | if (IS_ERR(child)) |