aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2012-07-09 10:57:13 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-10 12:16:05 -0400
commit7be531883a81d2dc23a79c1a34b4fdb0918f2ca8 (patch)
tree442201971a9c4a3fc937d31fad2aedcd4a841418
parentb669e0adb9f667acff16162ea0ff4fc404495b3c (diff)
regulator: tps65910: correct init value of n_voltages
Recent change in the core driver to get the maximum voltage is based on the (n_voltages -1) steps of voltage. For the tps65910, the (n_voltages -1)th step voltage is calculated based on the callback function list_voltage. This function direct maps the datasheet and adjust the first few steps for initial voltage as per datasheet, and hence initialize the n_voltages based on datasheet. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--drivers/regulator/tps65910-regulator.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c
index e319d963fee..64c93e0005b 100644
--- a/drivers/regulator/tps65910-regulator.c
+++ b/drivers/regulator/tps65910-regulator.c
@@ -194,66 +194,66 @@ static struct tps_info tps65911_regs[] = {
194 { 194 {
195 .name = "vdd1", 195 .name = "vdd1",
196 .vin_name = "vcc1", 196 .vin_name = "vcc1",
197 .n_voltages = 73, 197 .n_voltages = 0x4C,
198 .enable_time_us = 350, 198 .enable_time_us = 350,
199 }, 199 },
200 { 200 {
201 .name = "vdd2", 201 .name = "vdd2",
202 .vin_name = "vcc2", 202 .vin_name = "vcc2",
203 .n_voltages = 73, 203 .n_voltages = 0x4C,
204 .enable_time_us = 350, 204 .enable_time_us = 350,
205 }, 205 },
206 { 206 {
207 .name = "vddctrl", 207 .name = "vddctrl",
208 .n_voltages = 65, 208 .n_voltages = 0x44,
209 .enable_time_us = 900, 209 .enable_time_us = 900,
210 }, 210 },
211 { 211 {
212 .name = "ldo1", 212 .name = "ldo1",
213 .vin_name = "vcc6", 213 .vin_name = "vcc6",
214 .n_voltages = 47, 214 .n_voltages = 0x33,
215 .enable_time_us = 420, 215 .enable_time_us = 420,
216 }, 216 },
217 { 217 {
218 .name = "ldo2", 218 .name = "ldo2",
219 .vin_name = "vcc6", 219 .vin_name = "vcc6",
220 .n_voltages = 47, 220 .n_voltages = 0x33,
221 .enable_time_us = 420, 221 .enable_time_us = 420,
222 }, 222 },
223 { 223 {
224 .name = "ldo3", 224 .name = "ldo3",
225 .vin_name = "vcc5", 225 .vin_name = "vcc5",
226 .n_voltages = 24, 226 .n_voltages = 0x1A,
227 .enable_time_us = 230, 227 .enable_time_us = 230,
228 }, 228 },
229 { 229 {
230 .name = "ldo4", 230 .name = "ldo4",
231 .vin_name = "vcc5", 231 .vin_name = "vcc5",
232 .n_voltages = 47, 232 .n_voltages = 0x33,
233 .enable_time_us = 230, 233 .enable_time_us = 230,
234 }, 234 },
235 { 235 {
236 .name = "ldo5", 236 .name = "ldo5",
237 .vin_name = "vcc4", 237 .vin_name = "vcc4",
238 .n_voltages = 24, 238 .n_voltages = 0x1A,
239 .enable_time_us = 230, 239 .enable_time_us = 230,
240 }, 240 },
241 { 241 {
242 .name = "ldo6", 242 .name = "ldo6",
243 .vin_name = "vcc3", 243 .vin_name = "vcc3",
244 .n_voltages = 24, 244 .n_voltages = 0x1A,
245 .enable_time_us = 230, 245 .enable_time_us = 230,
246 }, 246 },
247 { 247 {
248 .name = "ldo7", 248 .name = "ldo7",
249 .vin_name = "vcc3", 249 .vin_name = "vcc3",
250 .n_voltages = 24, 250 .n_voltages = 0x1A,
251 .enable_time_us = 230, 251 .enable_time_us = 230,
252 }, 252 },
253 { 253 {
254 .name = "ldo8", 254 .name = "ldo8",
255 .vin_name = "vcc3", 255 .vin_name = "vcc3",
256 .n_voltages = 24, 256 .n_voltages = 0x1A,
257 .enable_time_us = 230, 257 .enable_time_us = 230,
258 }, 258 },
259}; 259};