summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-23 09:49:39 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-23 09:49:39 -0800
commit0a2c986557b964453f8deeaf56f6d88bf3e65e92 (patch)
tree7b27e1afff3e5380826d62b2f5bb50533ade4fec /include/linux
parent2d0f2400a49be3a177695eda381d91fec18cbd0e (diff)
parent780dc9ba4eb682a89be48d5b814feae6722a19e0 (diff)
downloadlinux-3.10-0a2c986557b964453f8deeaf56f6d88bf3e65e92.tar.gz
linux-3.10-0a2c986557b964453f8deeaf56f6d88bf3e65e92.tar.bz2
linux-3.10-0a2c986557b964453f8deeaf56f6d88bf3e65e92.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: TPS65910: Fix VDD1/2 voltage selector count
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mfd/tps65910.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mfd/tps65910.h b/include/linux/mfd/tps65910.h
index 82b4c8801a4..8bf2cb9502d 100644
--- a/include/linux/mfd/tps65910.h
+++ b/include/linux/mfd/tps65910.h
@@ -243,7 +243,8 @@
/*Registers VDD1, VDD2 voltage values definitions */
-#define VDD1_2_NUM_VOLTS 73
+#define VDD1_2_NUM_VOLT_FINE 73
+#define VDD1_2_NUM_VOLT_COARSE 3
#define VDD1_2_MIN_VOLT 6000
#define VDD1_2_OFFSET 125