diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-04 21:12:41 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-04 21:12:41 -0500 |
| commit | b2d60949242d63a9571213761b043871c1b0e49e (patch) | |
| tree | 5722e8fdd71e6d5278ef795e2d586067136b6b51 | |
| parent | 6d62768468d5ff96b3977a04045dd80d6710be5d (diff) | |
| parent | a7dddf2757d09ba38683b359a721dc2efe85cd24 (diff) | |
Merge remote-tracking branch 'regulator/fix/palmas' into tmp
| -rw-r--r-- | drivers/regulator/palmas-regulator.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c index cde13bb5a8fb..39cf14606784 100644 --- a/drivers/regulator/palmas-regulator.c +++ b/drivers/regulator/palmas-regulator.c | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * Copyright 2011-2012 Texas Instruments Inc. | 4 | * Copyright 2011-2012 Texas Instruments Inc. |
| 5 | * | 5 | * |
| 6 | * Author: Graeme Gregory <gg@slimlogic.co.uk> | 6 | * Author: Graeme Gregory <gg@slimlogic.co.uk> |
| 7 | * Author: Ian Lartey <ian@slimlogic.co.uk> | ||
| 7 | * | 8 | * |
| 8 | * This program is free software; you can redistribute it and/or modify it | 9 | * This program is free software; you can redistribute it and/or modify it |
| 9 | * under the terms of the GNU General Public License as published by the | 10 | * under the terms of the GNU General Public License as published by the |
| @@ -156,7 +157,7 @@ static const struct regs_info palmas_regs_info[] = { | |||
| 156 | * | 157 | * |
| 157 | * So they are basically (maxV-minV)/stepV | 158 | * So they are basically (maxV-minV)/stepV |
| 158 | */ | 159 | */ |
| 159 | #define PALMAS_SMPS_NUM_VOLTAGES 116 | 160 | #define PALMAS_SMPS_NUM_VOLTAGES 117 |
| 160 | #define PALMAS_SMPS10_NUM_VOLTAGES 2 | 161 | #define PALMAS_SMPS10_NUM_VOLTAGES 2 |
| 161 | #define PALMAS_LDO_NUM_VOLTAGES 50 | 162 | #define PALMAS_LDO_NUM_VOLTAGES 50 |
| 162 | 163 | ||