aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@nokia.com>2009-03-06 07:51:30 -0500
committerLiam Girdwood <lrg@slimlogic.co.uk>2009-03-31 06:29:54 -0400
commitd6bb69cfa88b8ac9f952de4fada5b216d5ba8830 (patch)
tree4d2aec1b7d78b492bed17769f6f27485e08f67f2 /drivers/regulator
parentca7255614e0861e36480103f4a402a115803d7b5 (diff)
regulator: twl4030 VAUX3 supports 3.0V
TWL4030 and TWL5030 support 3.0V on VAUX3. Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/twl4030-regulator.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/regulator/twl4030-regulator.c b/drivers/regulator/twl4030-regulator.c
index f3ec98c83e90..e2032fb60b55 100644
--- a/drivers/regulator/twl4030-regulator.c
+++ b/drivers/regulator/twl4030-regulator.c
@@ -193,6 +193,9 @@ static int twl4030reg_set_mode(struct regulator_dev *rdev, unsigned mode)
193 * 193 *
194 * VSEL values documented as "TI cannot support these values" are flagged 194 * VSEL values documented as "TI cannot support these values" are flagged
195 * in these tables as UNSUP() values; we normally won't assign them. 195 * in these tables as UNSUP() values; we normally won't assign them.
196 *
197 * VAUX3 at 3V is incorrectly listed in some TI manuals as unsupported.
198 * TI are revising the twl5030/tps659x0 specs to support that 3.0V setting.
196 */ 199 */
197#ifdef CONFIG_TWL4030_ALLOW_UNSUPPORTED 200#ifdef CONFIG_TWL4030_ALLOW_UNSUPPORTED
198#define UNSUP_MASK 0x0000 201#define UNSUP_MASK 0x0000
@@ -223,7 +226,7 @@ static const u16 VAUX2_VSEL_table[] = {
223}; 226};
224static const u16 VAUX3_VSEL_table[] = { 227static const u16 VAUX3_VSEL_table[] = {
225 1500, 1800, 2500, 2800, 228 1500, 1800, 2500, 2800,
226 UNSUP(3000), UNSUP(3000), UNSUP(3000), UNSUP(3000), 229 3000, 3000, 3000, 3000,
227}; 230};
228static const u16 VAUX4_VSEL_table[] = { 231static const u16 VAUX4_VSEL_table[] = {
229 700, 1000, 1200, UNSUP(1300), 232 700, 1000, 1200, UNSUP(1300),