diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-23 12:49:39 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-23 12:49:39 -0500 |
| commit | 0a2c986557b964453f8deeaf56f6d88bf3e65e92 (patch) | |
| tree | 7b27e1afff3e5380826d62b2f5bb50533ade4fec /include/linux | |
| parent | 2d0f2400a49be3a177695eda381d91fec18cbd0e (diff) | |
| parent | 780dc9ba4eb682a89be48d5b814feae6722a19e0 (diff) | |
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.h | 3 |
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 @@ | |||
| 243 | 243 | ||
| 244 | 244 | ||
| 245 | /*Registers VDD1, VDD2 voltage values definitions */ | 245 | /*Registers VDD1, VDD2 voltage values definitions */ |
| 246 | #define VDD1_2_NUM_VOLTS 73 | 246 | #define VDD1_2_NUM_VOLT_FINE 73 |
| 247 | #define VDD1_2_NUM_VOLT_COARSE 3 | ||
| 247 | #define VDD1_2_MIN_VOLT 6000 | 248 | #define VDD1_2_MIN_VOLT 6000 |
| 248 | #define VDD1_2_OFFSET 125 | 249 | #define VDD1_2_OFFSET 125 |
| 249 | 250 | ||