mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-28 23:24:50 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'regulator/fix/palmas' into tmp

Browse source
This commit is contained in:
Mark Brown 2013-03-05 10:12:41 +08:00
commit b2d6094924
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/regulator/palmas-regulator.c
View file

@ -4,6 +4,7 @@
* Copyright 2011-2012 Texas Instruments Inc. * Copyright 2011-2012 Texas Instruments Inc.
* *
* Author: Graeme Gregory <gg@slimlogic.co.uk> * 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 * 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 * 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 * 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_SMPS10_NUM_VOLTAGES 2
#define PALMAS_LDO_NUM_VOLTAGES 50 #define PALMAS_LDO_NUM_VOLTAGES 50