diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-23 18:48:57 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-23 18:48:57 +0000 |
| commit | 68aaa37d0e8232d62a7e9411699e0dc005750186 (patch) | |
| tree | 9bb05a5057574e506d5e75bd1b4bf9e39593d7ef /include/linux | |
| parent | regulator: Don't create voltage sysfs entries if we can't read voltage (diff) | |
| parent | regulator: TPS65910: Fix VDD1/2 voltage selector count (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mfd/tps65910.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mfd/tps65910.h b/include/linux/mfd/tps65910.h index 03a035d2236b..d0cb12eba402 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 |