diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 22:43:30 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 22:43:30 -0500 |
commit | f1e0d5f1384f95b03f7b12092792db761af20ee7 (patch) | |
tree | e69847313b0030d2f10a168fff532e4679664e7b /drivers/regulator | |
parent | 21e55ca4060e5a3891ab72cbbc5d6c85e3036049 (diff) | |
parent | a9a5659ac61b9e21d17993a6c0fbbeb83e182526 (diff) |
Merge remote-tracking branch 'regulator/topic/tps65910' into regulator-next
Diffstat (limited to 'drivers/regulator')
-rw-r--r-- | drivers/regulator/tps65910-regulator.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c index 6b77bbf32ebc..59c3770fa77d 100644 --- a/drivers/regulator/tps65910-regulator.c +++ b/drivers/regulator/tps65910-regulator.c | |||
@@ -38,6 +38,11 @@ static const unsigned int VIO_VSEL_table[] = { | |||
38 | 38 | ||
39 | /* VSEL tables for TPS65910 specific LDOs and dcdc's */ | 39 | /* VSEL tables for TPS65910 specific LDOs and dcdc's */ |
40 | 40 | ||
41 | /* supported VRTC voltages in microvolts */ | ||
42 | static const unsigned int VRTC_VSEL_table[] = { | ||
43 | 1800000, | ||
44 | }; | ||
45 | |||
41 | /* supported VDD3 voltages in microvolts */ | 46 | /* supported VDD3 voltages in microvolts */ |
42 | static const unsigned int VDD3_VSEL_table[] = { | 47 | static const unsigned int VDD3_VSEL_table[] = { |
43 | 5000000, | 48 | 5000000, |
@@ -95,6 +100,8 @@ static struct tps_info tps65910_regs[] = { | |||
95 | { | 100 | { |
96 | .name = "vrtc", | 101 | .name = "vrtc", |
97 | .vin_name = "vcc7", | 102 | .vin_name = "vcc7", |
103 | .n_voltages = ARRAY_SIZE(VRTC_VSEL_table), | ||
104 | .voltage_table = VRTC_VSEL_table, | ||
98 | .enable_time_us = 2200, | 105 | .enable_time_us = 2200, |
99 | }, | 106 | }, |
100 | { | 107 | { |