diff options
author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2015-02-03 17:43:49 -0500 |
---|---|---|
committer | Kukjin Kim <kgene@kernel.org> | 2015-02-03 17:43:49 -0500 |
commit | 4a235f6aa9d0ff6819201a39c334e4989b45b57b (patch) | |
tree | 81ee55db7f520ffb9c10d0f1f2fc57ce71ba7975 | |
parent | e8614292cd41971b54e60188d4e99abdc8695073 (diff) |
ARM: dts: Add suspend configuration for max77686 regulators for exynos4412-trats2
Add suspend to RAM configuration for max77686 regulators. Some LDOs
and bucks are disabled. This reduces energy consumption during S2R,
approximately from 17 mA to 9 mA.
Additionally remove old and not supported bindings:
- regulator-mem-off
- regulator-mem-idle
- regulator-mem-on
The max77686 driver does not parse them and they are not documented
anywere.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
-rw-r--r-- | arch/arm/boot/dts/exynos4412-trats2.dts | 72 |
1 files changed, 42 insertions, 30 deletions
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts index dea96574183f..7ea8b7dce0cb 100644 --- a/arch/arm/boot/dts/exynos4412-trats2.dts +++ b/arch/arm/boot/dts/exynos4412-trats2.dts | |||
@@ -227,7 +227,6 @@ | |||
227 | regulator-min-microvolt = <1000000>; | 227 | regulator-min-microvolt = <1000000>; |
228 | regulator-max-microvolt = <1000000>; | 228 | regulator-max-microvolt = <1000000>; |
229 | regulator-always-on; | 229 | regulator-always-on; |
230 | regulator-mem-on; | ||
231 | }; | 230 | }; |
232 | 231 | ||
233 | ldo2_reg: ldo2 { | 232 | ldo2_reg: ldo2 { |
@@ -236,7 +235,9 @@ | |||
236 | regulator-min-microvolt = <1200000>; | 235 | regulator-min-microvolt = <1200000>; |
237 | regulator-max-microvolt = <1200000>; | 236 | regulator-max-microvolt = <1200000>; |
238 | regulator-always-on; | 237 | regulator-always-on; |
239 | regulator-mem-on; | 238 | regulator-state-mem { |
239 | regulator-on-in-suspend; | ||
240 | }; | ||
240 | }; | 241 | }; |
241 | 242 | ||
242 | ldo3_reg: ldo3 { | 243 | ldo3_reg: ldo3 { |
@@ -245,7 +246,6 @@ | |||
245 | regulator-min-microvolt = <1800000>; | 246 | regulator-min-microvolt = <1800000>; |
246 | regulator-max-microvolt = <1800000>; | 247 | regulator-max-microvolt = <1800000>; |
247 | regulator-always-on; | 248 | regulator-always-on; |
248 | regulator-mem-on; | ||
249 | }; | 249 | }; |
250 | 250 | ||
251 | ldo4_reg: ldo4 { | 251 | ldo4_reg: ldo4 { |
@@ -254,7 +254,6 @@ | |||
254 | regulator-min-microvolt = <2800000>; | 254 | regulator-min-microvolt = <2800000>; |
255 | regulator-max-microvolt = <2800000>; | 255 | regulator-max-microvolt = <2800000>; |
256 | regulator-always-on; | 256 | regulator-always-on; |
257 | regulator-mem-on; | ||
258 | }; | 257 | }; |
259 | 258 | ||
260 | ldo5_reg: ldo5 { | 259 | ldo5_reg: ldo5 { |
@@ -263,7 +262,6 @@ | |||
263 | regulator-min-microvolt = <1800000>; | 262 | regulator-min-microvolt = <1800000>; |
264 | regulator-max-microvolt = <1800000>; | 263 | regulator-max-microvolt = <1800000>; |
265 | regulator-always-on; | 264 | regulator-always-on; |
266 | regulator-mem-on; | ||
267 | }; | 265 | }; |
268 | 266 | ||
269 | ldo6_reg: ldo6 { | 267 | ldo6_reg: ldo6 { |
@@ -272,7 +270,9 @@ | |||
272 | regulator-min-microvolt = <1000000>; | 270 | regulator-min-microvolt = <1000000>; |
273 | regulator-max-microvolt = <1000000>; | 271 | regulator-max-microvolt = <1000000>; |
274 | regulator-always-on; | 272 | regulator-always-on; |
275 | regulator-mem-on; | 273 | regulator-state-mem { |
274 | regulator-on-in-suspend; | ||
275 | }; | ||
276 | }; | 276 | }; |
277 | 277 | ||
278 | ldo7_reg: ldo7 { | 278 | ldo7_reg: ldo7 { |
@@ -281,7 +281,9 @@ | |||
281 | regulator-min-microvolt = <1000000>; | 281 | regulator-min-microvolt = <1000000>; |
282 | regulator-max-microvolt = <1000000>; | 282 | regulator-max-microvolt = <1000000>; |
283 | regulator-always-on; | 283 | regulator-always-on; |
284 | regulator-mem-on; | 284 | regulator-state-mem { |
285 | regulator-on-in-suspend; | ||
286 | }; | ||
285 | }; | 287 | }; |
286 | 288 | ||
287 | ldo8_reg: ldo8 { | 289 | ldo8_reg: ldo8 { |
@@ -289,7 +291,9 @@ | |||
289 | regulator-name = "VMIPI_1.0V"; | 291 | regulator-name = "VMIPI_1.0V"; |
290 | regulator-min-microvolt = <1000000>; | 292 | regulator-min-microvolt = <1000000>; |
291 | regulator-max-microvolt = <1000000>; | 293 | regulator-max-microvolt = <1000000>; |
292 | regulator-mem-off; | 294 | regulator-state-mem { |
295 | regulator-off-in-suspend; | ||
296 | }; | ||
293 | }; | 297 | }; |
294 | 298 | ||
295 | ldo9_reg: ldo9 { | 299 | ldo9_reg: ldo9 { |
@@ -297,7 +301,6 @@ | |||
297 | regulator-name = "CAM_ISP_MIPI_1.2V"; | 301 | regulator-name = "CAM_ISP_MIPI_1.2V"; |
298 | regulator-min-microvolt = <1200000>; | 302 | regulator-min-microvolt = <1200000>; |
299 | regulator-max-microvolt = <1200000>; | 303 | regulator-max-microvolt = <1200000>; |
300 | regulator-mem-idle; | ||
301 | }; | 304 | }; |
302 | 305 | ||
303 | ldo10_reg: ldo10 { | 306 | ldo10_reg: ldo10 { |
@@ -305,7 +308,9 @@ | |||
305 | regulator-name = "VMIPI_1.8V"; | 308 | regulator-name = "VMIPI_1.8V"; |
306 | regulator-min-microvolt = <1800000>; | 309 | regulator-min-microvolt = <1800000>; |
307 | regulator-max-microvolt = <1800000>; | 310 | regulator-max-microvolt = <1800000>; |
308 | regulator-mem-off; | 311 | regulator-state-mem { |
312 | regulator-off-in-suspend; | ||
313 | }; | ||
309 | }; | 314 | }; |
310 | 315 | ||
311 | ldo11_reg: ldo11 { | 316 | ldo11_reg: ldo11 { |
@@ -314,7 +319,9 @@ | |||
314 | regulator-min-microvolt = <1950000>; | 319 | regulator-min-microvolt = <1950000>; |
315 | regulator-max-microvolt = <1950000>; | 320 | regulator-max-microvolt = <1950000>; |
316 | regulator-always-on; | 321 | regulator-always-on; |
317 | regulator-mem-off; | 322 | regulator-state-mem { |
323 | regulator-off-in-suspend; | ||
324 | }; | ||
318 | }; | 325 | }; |
319 | 326 | ||
320 | ldo12_reg: ldo12 { | 327 | ldo12_reg: ldo12 { |
@@ -322,7 +329,9 @@ | |||
322 | regulator-name = "VUOTG_3.0V"; | 329 | regulator-name = "VUOTG_3.0V"; |
323 | regulator-min-microvolt = <3000000>; | 330 | regulator-min-microvolt = <3000000>; |
324 | regulator-max-microvolt = <3000000>; | 331 | regulator-max-microvolt = <3000000>; |
325 | regulator-mem-off; | 332 | regulator-state-mem { |
333 | regulator-off-in-suspend; | ||
334 | }; | ||
326 | }; | 335 | }; |
327 | 336 | ||
328 | ldo13_reg: ldo13 { | 337 | ldo13_reg: ldo13 { |
@@ -330,7 +339,6 @@ | |||
330 | regulator-name = "NFC_AVDD_1.8V"; | 339 | regulator-name = "NFC_AVDD_1.8V"; |
331 | regulator-min-microvolt = <1800000>; | 340 | regulator-min-microvolt = <1800000>; |
332 | regulator-max-microvolt = <1800000>; | 341 | regulator-max-microvolt = <1800000>; |
333 | regulator-mem-idle; | ||
334 | }; | 342 | }; |
335 | 343 | ||
336 | ldo14_reg: ldo14 { | 344 | ldo14_reg: ldo14 { |
@@ -339,7 +347,9 @@ | |||
339 | regulator-min-microvolt = <1950000>; | 347 | regulator-min-microvolt = <1950000>; |
340 | regulator-max-microvolt = <1950000>; | 348 | regulator-max-microvolt = <1950000>; |
341 | regulator-always-on; | 349 | regulator-always-on; |
342 | regulator-mem-off; | 350 | regulator-state-mem { |
351 | regulator-off-in-suspend; | ||
352 | }; | ||
343 | }; | 353 | }; |
344 | 354 | ||
345 | ldo15_reg: ldo15 { | 355 | ldo15_reg: ldo15 { |
@@ -347,7 +357,9 @@ | |||
347 | regulator-name = "VHSIC_1.0V"; | 357 | regulator-name = "VHSIC_1.0V"; |
348 | regulator-min-microvolt = <1000000>; | 358 | regulator-min-microvolt = <1000000>; |
349 | regulator-max-microvolt = <1000000>; | 359 | regulator-max-microvolt = <1000000>; |
350 | regulator-mem-off; | 360 | regulator-state-mem { |
361 | regulator-on-in-suspend; | ||
362 | }; | ||
351 | }; | 363 | }; |
352 | 364 | ||
353 | ldo16_reg: ldo16 { | 365 | ldo16_reg: ldo16 { |
@@ -355,7 +367,9 @@ | |||
355 | regulator-name = "VHSIC_1.8V"; | 367 | regulator-name = "VHSIC_1.8V"; |
356 | regulator-min-microvolt = <1800000>; | 368 | regulator-min-microvolt = <1800000>; |
357 | regulator-max-microvolt = <1800000>; | 369 | regulator-max-microvolt = <1800000>; |
358 | regulator-mem-off; | 370 | regulator-state-mem { |
371 | regulator-on-in-suspend; | ||
372 | }; | ||
359 | }; | 373 | }; |
360 | 374 | ||
361 | ldo17_reg: ldo17 { | 375 | ldo17_reg: ldo17 { |
@@ -363,7 +377,6 @@ | |||
363 | regulator-name = "CAM_SENSOR_CORE_1.2V"; | 377 | regulator-name = "CAM_SENSOR_CORE_1.2V"; |
364 | regulator-min-microvolt = <1200000>; | 378 | regulator-min-microvolt = <1200000>; |
365 | regulator-max-microvolt = <1200000>; | 379 | regulator-max-microvolt = <1200000>; |
366 | regulator-mem-idle; | ||
367 | }; | 380 | }; |
368 | 381 | ||
369 | ldo18_reg: ldo18 { | 382 | ldo18_reg: ldo18 { |
@@ -371,7 +384,6 @@ | |||
371 | regulator-name = "CAM_ISP_SEN_IO_1.8V"; | 384 | regulator-name = "CAM_ISP_SEN_IO_1.8V"; |
372 | regulator-min-microvolt = <1800000>; | 385 | regulator-min-microvolt = <1800000>; |
373 | regulator-max-microvolt = <1800000>; | 386 | regulator-max-microvolt = <1800000>; |
374 | regulator-mem-idle; | ||
375 | }; | 387 | }; |
376 | 388 | ||
377 | ldo19_reg: ldo19 { | 389 | ldo19_reg: ldo19 { |
@@ -379,7 +391,6 @@ | |||
379 | regulator-name = "VT_CAM_1.8V"; | 391 | regulator-name = "VT_CAM_1.8V"; |
380 | regulator-min-microvolt = <1800000>; | 392 | regulator-min-microvolt = <1800000>; |
381 | regulator-max-microvolt = <1800000>; | 393 | regulator-max-microvolt = <1800000>; |
382 | regulator-mem-idle; | ||
383 | }; | 394 | }; |
384 | 395 | ||
385 | ldo20_reg: ldo20 { | 396 | ldo20_reg: ldo20 { |
@@ -387,7 +398,6 @@ | |||
387 | regulator-name = "VDDQ_PRE_1.8V"; | 398 | regulator-name = "VDDQ_PRE_1.8V"; |
388 | regulator-min-microvolt = <1800000>; | 399 | regulator-min-microvolt = <1800000>; |
389 | regulator-max-microvolt = <1800000>; | 400 | regulator-max-microvolt = <1800000>; |
390 | regulator-mem-idle; | ||
391 | }; | 401 | }; |
392 | 402 | ||
393 | ldo21_reg: ldo21 { | 403 | ldo21_reg: ldo21 { |
@@ -395,7 +405,6 @@ | |||
395 | regulator-name = "VTF_2.8V"; | 405 | regulator-name = "VTF_2.8V"; |
396 | regulator-min-microvolt = <2800000>; | 406 | regulator-min-microvolt = <2800000>; |
397 | regulator-max-microvolt = <2800000>; | 407 | regulator-max-microvolt = <2800000>; |
398 | regulator-mem-idle; | ||
399 | }; | 408 | }; |
400 | 409 | ||
401 | ldo22_reg: ldo22 { | 410 | ldo22_reg: ldo22 { |
@@ -410,7 +419,6 @@ | |||
410 | regulator-name = "TSP_AVDD_3.3V"; | 419 | regulator-name = "TSP_AVDD_3.3V"; |
411 | regulator-min-microvolt = <3300000>; | 420 | regulator-min-microvolt = <3300000>; |
412 | regulator-max-microvolt = <3300000>; | 421 | regulator-max-microvolt = <3300000>; |
413 | regulator-mem-idle; | ||
414 | }; | 422 | }; |
415 | 423 | ||
416 | ldo24_reg: ldo24 { | 424 | ldo24_reg: ldo24 { |
@@ -418,7 +426,6 @@ | |||
418 | regulator-name = "TSP_VDD_1.8V"; | 426 | regulator-name = "TSP_VDD_1.8V"; |
419 | regulator-min-microvolt = <1800000>; | 427 | regulator-min-microvolt = <1800000>; |
420 | regulator-max-microvolt = <1800000>; | 428 | regulator-max-microvolt = <1800000>; |
421 | regulator-mem-idle; | ||
422 | }; | 429 | }; |
423 | 430 | ||
424 | ldo25_reg: ldo25 { | 431 | ldo25_reg: ldo25 { |
@@ -426,7 +433,6 @@ | |||
426 | regulator-name = "LCD_VCC_3.3V"; | 433 | regulator-name = "LCD_VCC_3.3V"; |
427 | regulator-min-microvolt = <2800000>; | 434 | regulator-min-microvolt = <2800000>; |
428 | regulator-max-microvolt = <2800000>; | 435 | regulator-max-microvolt = <2800000>; |
429 | regulator-mem-idle; | ||
430 | }; | 436 | }; |
431 | 437 | ||
432 | ldo26_reg: ldo26 { | 438 | ldo26_reg: ldo26 { |
@@ -434,7 +440,6 @@ | |||
434 | regulator-name = "MOTOR_VCC_3.0V"; | 440 | regulator-name = "MOTOR_VCC_3.0V"; |
435 | regulator-min-microvolt = <3000000>; | 441 | regulator-min-microvolt = <3000000>; |
436 | regulator-max-microvolt = <3000000>; | 442 | regulator-max-microvolt = <3000000>; |
437 | regulator-mem-idle; | ||
438 | }; | 443 | }; |
439 | 444 | ||
440 | buck1_reg: buck1 { | 445 | buck1_reg: buck1 { |
@@ -444,7 +449,9 @@ | |||
444 | regulator-max-microvolt = <1100000>; | 449 | regulator-max-microvolt = <1100000>; |
445 | regulator-always-on; | 450 | regulator-always-on; |
446 | regulator-boot-on; | 451 | regulator-boot-on; |
447 | regulator-mem-off; | 452 | regulator-state-mem { |
453 | regulator-off-in-suspend; | ||
454 | }; | ||
448 | }; | 455 | }; |
449 | 456 | ||
450 | buck2_reg: buck2 { | 457 | buck2_reg: buck2 { |
@@ -454,7 +461,9 @@ | |||
454 | regulator-max-microvolt = <1500000>; | 461 | regulator-max-microvolt = <1500000>; |
455 | regulator-always-on; | 462 | regulator-always-on; |
456 | regulator-boot-on; | 463 | regulator-boot-on; |
457 | regulator-mem-off; | 464 | regulator-state-mem { |
465 | regulator-on-in-suspend; | ||
466 | }; | ||
458 | }; | 467 | }; |
459 | 468 | ||
460 | buck3_reg: buck3 { | 469 | buck3_reg: buck3 { |
@@ -464,7 +473,9 @@ | |||
464 | regulator-max-microvolt = <1150000>; | 473 | regulator-max-microvolt = <1150000>; |
465 | regulator-always-on; | 474 | regulator-always-on; |
466 | regulator-boot-on; | 475 | regulator-boot-on; |
467 | regulator-mem-off; | 476 | regulator-state-mem { |
477 | regulator-off-in-suspend; | ||
478 | }; | ||
468 | }; | 479 | }; |
469 | 480 | ||
470 | buck4_reg: buck4 { | 481 | buck4_reg: buck4 { |
@@ -473,7 +484,9 @@ | |||
473 | regulator-min-microvolt = <850000>; | 484 | regulator-min-microvolt = <850000>; |
474 | regulator-max-microvolt = <1150000>; | 485 | regulator-max-microvolt = <1150000>; |
475 | regulator-boot-on; | 486 | regulator-boot-on; |
476 | regulator-mem-off; | 487 | regulator-state-mem { |
488 | regulator-off-in-suspend; | ||
489 | }; | ||
477 | }; | 490 | }; |
478 | 491 | ||
479 | buck5_reg: buck5 { | 492 | buck5_reg: buck5 { |
@@ -512,7 +525,6 @@ | |||
512 | regulator-name = "CAM_ISP_CORE_1.2V"; | 525 | regulator-name = "CAM_ISP_CORE_1.2V"; |
513 | regulator-min-microvolt = <1000000>; | 526 | regulator-min-microvolt = <1000000>; |
514 | regulator-max-microvolt = <1200000>; | 527 | regulator-max-microvolt = <1200000>; |
515 | regulator-mem-off; | ||
516 | }; | 528 | }; |
517 | }; | 529 | }; |
518 | }; | 530 | }; |