aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/ab8500.c
diff options
context:
space:
mode:
authorBengt Jonsson <bengt.g.jonsson@stericsson.com>2011-03-10 08:43:31 -0500
committerLiam Girdwood <lrg@slimlogic.co.uk>2011-03-26 10:15:05 -0400
commitea05ef31f2aa98b25d14222300dc9c1d1eb59e41 (patch)
tree8011d07af586b7e83259abce6b4f4e2da0c7a17d /drivers/regulator/ab8500.c
parent19c98825941cb10b59c9953665fc4495bc82c0ae (diff)
regulator: add support for USB voltage regulator
Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers/regulator/ab8500.c')
-rw-r--r--drivers/regulator/ab8500.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index d9a052c53aec..5a77630095d9 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -9,7 +9,7 @@
9 * AB8500 peripheral regulators 9 * AB8500 peripheral regulators
10 * 10 *
11 * AB8500 supports the following regulators: 11 * AB8500 supports the following regulators:
12 * VAUX1/2/3, VINTCORE, VTVOUT, VAUDIO, VAMIC1/2, VDMIC, VANA 12 * VAUX1/2/3, VINTCORE, VTVOUT, VUSB, VAUDIO, VAMIC1/2, VDMIC, VANA
13 */ 13 */
14#include <linux/init.h> 14#include <linux/init.h>
15#include <linux/kernel.h> 15#include <linux/kernel.h>
@@ -432,6 +432,21 @@ static struct ab8500_regulator_info
432 .update_mask = 0x82, 432 .update_mask = 0x82,
433 .update_val_enable = 0x02, 433 .update_val_enable = 0x02,
434 }, 434 },
435 [AB8500_LDO_USB] = {
436 .desc = {
437 .name = "LDO-USB",
438 .ops = &ab8500_regulator_fixed_ops,
439 .type = REGULATOR_VOLTAGE,
440 .id = AB8500_LDO_USB,
441 .owner = THIS_MODULE,
442 .n_voltages = 1,
443 },
444 .fixed_uV = 3300000,
445 .update_bank = 0x03,
446 .update_reg = 0x82,
447 .update_mask = 0x03,
448 .update_val_enable = 0x01,
449 },
435 [AB8500_LDO_AUDIO] = { 450 [AB8500_LDO_AUDIO] = {
436 .desc = { 451 .desc = {
437 .name = "LDO-AUDIO", 452 .name = "LDO-AUDIO",