diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-05 10:12:41 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-05 10:12:41 +0800 |
| commit | b2d60949242d63a9571213761b043871c1b0e49e (patch) | |
| tree | 5722e8fdd71e6d5278ef795e2d586067136b6b51 /drivers/regulator | |
| parent | 6d62768468d5ff96b3977a04045dd80d6710be5d (diff) | |
| parent | a7dddf2757d09ba38683b359a721dc2efe85cd24 (diff) | |
| download | op-kernel-dev-b2d60949242d63a9571213761b043871c1b0e49e.zip op-kernel-dev-b2d60949242d63a9571213761b043871c1b0e49e.tar.gz | |
Merge remote-tracking branch 'regulator/fix/palmas' into tmp
Diffstat (limited to 'drivers/regulator')
| -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 cde13bb..39cf146 100644 --- a/drivers/regulator/palmas-regulator.c +++ b/drivers/regulator/palmas-regulator.c @@ -4,6 +4,7 @@ * Copyright 2011-2012 Texas Instruments Inc. * * Author: Graeme Gregory <gg@slimlogic.co.uk> + * Author: Ian Lartey <ian@slimlogic.co.uk> * * This program is free software; you can redistribute it and/or modify it * 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[] = { * * So they are basically (maxV-minV)/stepV */ -#define PALMAS_SMPS_NUM_VOLTAGES 116 +#define PALMAS_SMPS_NUM_VOLTAGES 117 #define PALMAS_SMPS10_NUM_VOLTAGES 2 #define PALMAS_LDO_NUM_VOLTAGES 50 |
