aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-09-20 19:04:06 -0400
committerStephen Warren <swarren@nvidia.com>2012-11-05 13:36:04 -0500
commitb9c665d75beb9239f8a0847786cf27dcb8a61b00 (patch)
treef1a66960f69bd7e7e47590c4880e177bc88f1524
parentdc9fe7f9730c927cd518d9fc7a616d188872e468 (diff)
ARM: tegra: update *.dts for regulator-compatible deprecation
Commit 13511de "regulator: deprecate regulator-compatible DT property" now allows for simpler content within the regulators node within a PMIC. Modify all the Tegra device tree files to take advantage of this. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Thierry Reding <thierry.reding@avionic-design.de>
Diffstat
-rw-r--r--arch/arm/boot/dts/tegra20-harmony.dts63
-rw-r--r--arch/arm/boot/dts/tegra20-paz00.dts59
-rw-r--r--arch/arm/boot/dts/tegra20-seaboard.dts59
-rw-r--r--arch/arm/boot/dts/tegra20-tamonten.dtsi63
-rw-r--r--arch/arm/boot/dts/tegra20-ventana.dts59
-rw-r--r--arch/arm/boot/dts/tegra20-whistler.dts119
-rw-r--r--arch/arm/boot/dts/tegra30-cardhu.dtsi47
7 files changed, 112 insertions, 357 deletions
diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index c3ef1ad26b6a..74b8a47adf91 100644
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -297,131 +297,98 @@
297 vinldo9-supply = <&sm2_reg>; 297 vinldo9-supply = <&sm2_reg>;
298 298
299 regulators { 299 regulators {
300 #address-cells = <1>; 300 sys_reg: sys {
301 #size-cells = <0>;
302
303 sys_reg: regulator@0 {
304 reg = <0>;
305 regulator-compatible = "sys";
306 regulator-name = "vdd_sys"; 301 regulator-name = "vdd_sys";
307 regulator-always-on; 302 regulator-always-on;
308 }; 303 };
309 304
310 regulator@1 { 305 sm0 {
311 reg = <1>;
312 regulator-compatible = "sm0";
313 regulator-name = "vdd_sm0,vdd_core"; 306 regulator-name = "vdd_sm0,vdd_core";
314 regulator-min-microvolt = <1200000>; 307 regulator-min-microvolt = <1200000>;
315 regulator-max-microvolt = <1200000>; 308 regulator-max-microvolt = <1200000>;
316 regulator-always-on; 309 regulator-always-on;
317 }; 310 };
318 311
319 regulator@2 { 312 sm1 {
320 reg = <2>;
321 regulator-compatible = "sm1";
322 regulator-name = "vdd_sm1,vdd_cpu"; 313 regulator-name = "vdd_sm1,vdd_cpu";
323 regulator-min-microvolt = <1000000>; 314 regulator-min-microvolt = <1000000>;
324 regulator-max-microvolt = <1000000>; 315 regulator-max-microvolt = <1000000>;
325 regulator-always-on; 316 regulator-always-on;
326 }; 317 };
327 318
328 sm2_reg: regulator@3 { 319 sm2_reg: sm2 {
329 reg = <3>;
330 regulator-compatible = "sm2";
331 regulator-name = "vdd_sm2,vin_ldo*"; 320 regulator-name = "vdd_sm2,vin_ldo*";
332 regulator-min-microvolt = <3700000>; 321 regulator-min-microvolt = <3700000>;
333 regulator-max-microvolt = <3700000>; 322 regulator-max-microvolt = <3700000>;
334 regulator-always-on; 323 regulator-always-on;
335 }; 324 };
336 325
337 regulator@4 { 326 ldo0 {
338 reg = <4>;
339 regulator-compatible = "ldo0";
340 regulator-name = "vdd_ldo0,vddio_pex_clk"; 327 regulator-name = "vdd_ldo0,vddio_pex_clk";
341 regulator-min-microvolt = <3300000>; 328 regulator-min-microvolt = <3300000>;
342 regulator-max-microvolt = <3300000>; 329 regulator-max-microvolt = <3300000>;
343 }; 330 };
344 331
345 regulator@5 { 332 ldo1 {
346 reg = <5>;
347 regulator-compatible = "ldo1";
348 regulator-name = "vdd_ldo1,avdd_pll*"; 333 regulator-name = "vdd_ldo1,avdd_pll*";
349 regulator-min-microvolt = <1100000>; 334 regulator-min-microvolt = <1100000>;
350 regulator-max-microvolt = <1100000>; 335 regulator-max-microvolt = <1100000>;
351 regulator-always-on; 336 regulator-always-on;
352 }; 337 };
353 338
354 regulator@6 { 339 ldo2 {
355 reg = <6>;
356 regulator-compatible = "ldo2";
357 regulator-name = "vdd_ldo2,vdd_rtc"; 340 regulator-name = "vdd_ldo2,vdd_rtc";
358 regulator-min-microvolt = <1200000>; 341 regulator-min-microvolt = <1200000>;
359 regulator-max-microvolt = <1200000>; 342 regulator-max-microvolt = <1200000>;
360 }; 343 };
361 344
362 regulator@7 { 345 ldo3 {
363 reg = <7>;
364 regulator-compatible = "ldo3";
365 regulator-name = "vdd_ldo3,avdd_usb*"; 346 regulator-name = "vdd_ldo3,avdd_usb*";
366 regulator-min-microvolt = <3300000>; 347 regulator-min-microvolt = <3300000>;
367 regulator-max-microvolt = <3300000>; 348 regulator-max-microvolt = <3300000>;
368 regulator-always-on; 349 regulator-always-on;
369 }; 350 };
370 351
371 regulator@8 { 352 ldo4 {
372 reg = <8>;
373 regulator-compatible = "ldo4";
374 regulator-name = "vdd_ldo4,avdd_osc,vddio_sys"; 353 regulator-name = "vdd_ldo4,avdd_osc,vddio_sys";
375 regulator-min-microvolt = <1800000>; 354 regulator-min-microvolt = <1800000>;
376 regulator-max-microvolt = <1800000>; 355 regulator-max-microvolt = <1800000>;
377 regulator-always-on; 356 regulator-always-on;
378 }; 357 };
379 358
380 regulator@9 { 359 ldo5 {
381 reg = <9>;
382 regulator-compatible = "ldo5";
383 regulator-name = "vdd_ldo5,vcore_mmc"; 360 regulator-name = "vdd_ldo5,vcore_mmc";
384 regulator-min-microvolt = <2850000>; 361 regulator-min-microvolt = <2850000>;
385 regulator-max-microvolt = <2850000>; 362 regulator-max-microvolt = <2850000>;
386 regulator-always-on; 363 regulator-always-on;
387 }; 364 };
388 365
389 regulator@10 { 366 ldo6 {
390 reg = <10>;
391 regulator-compatible = "ldo6";
392 regulator-name = "vdd_ldo6,avdd_vdac"; 367 regulator-name = "vdd_ldo6,avdd_vdac";
393 regulator-min-microvolt = <1800000>; 368 regulator-min-microvolt = <1800000>;
394 regulator-max-microvolt = <1800000>; 369 regulator-max-microvolt = <1800000>;
395 }; 370 };
396 371
397 regulator@11 { 372 ldo7 {
398 reg = <11>;
399 regulator-compatible = "ldo7";
400 regulator-name = "vdd_ldo7,avdd_hdmi"; 373 regulator-name = "vdd_ldo7,avdd_hdmi";
401 regulator-min-microvolt = <3300000>; 374 regulator-min-microvolt = <3300000>;
402 regulator-max-microvolt = <3300000>; 375 regulator-max-microvolt = <3300000>;
403 }; 376 };
404 377
405 regulator@12 { 378 ldo8 {
406 reg = <12>;
407 regulator-compatible = "ldo8";
408 regulator-name = "vdd_ldo8,avdd_hdmi_pll"; 379 regulator-name = "vdd_ldo8,avdd_hdmi_pll";
409 regulator-min-microvolt = <1800000>; 380 regulator-min-microvolt = <1800000>;
410 regulator-max-microvolt = <1800000>; 381 regulator-max-microvolt = <1800000>;
411 }; 382 };
412 383
413 regulator@13 { 384 ldo9 {
414 reg = <13>;
415 regulator-compatible = "ldo9";
416 regulator-name = "vdd_ldo9,avdd_2v85,vdd_ddr_rx"; 385 regulator-name = "vdd_ldo9,avdd_2v85,vdd_ddr_rx";
417 regulator-min-microvolt = <2850000>; 386 regulator-min-microvolt = <2850000>;
418 regulator-max-microvolt = <2850000>; 387 regulator-max-microvolt = <2850000>;
419 regulator-always-on; 388 regulator-always-on;
420 }; 389 };
421 390
422 regulator@14 { 391 ldo_rtc {
423 reg = <14>;
424 regulator-compatible = "ldo_rtc";
425 regulator-name = "vdd_rtc_out,vdd_cell"; 392 regulator-name = "vdd_rtc_out,vdd_cell";
426 regulator-min-microvolt = <3300000>; 393 regulator-min-microvolt = <3300000>;
427 regulator-max-microvolt = <3300000>; 394 regulator-max-microvolt = <3300000>;
diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts
index ddf287f52d49..6a93d1404c76 100644
--- a/arch/arm/boot/dts/tegra20-paz00.dts
+++ b/arch/arm/boot/dts/tegra20-paz00.dts
@@ -291,37 +291,26 @@
291 vinldo9-supply = <&sm2_reg>; 291 vinldo9-supply = <&sm2_reg>;
292 292
293 regulators { 293 regulators {
294 #address-cells = <1>; 294 sys_reg: sys {
295 #size-cells = <0>;
296
297 sys_reg: regulator@0 {
298 reg = <0>;
299 regulator-compatible = "sys";
300 regulator-name = "vdd_sys"; 295 regulator-name = "vdd_sys";
301 regulator-always-on; 296 regulator-always-on;
302 }; 297 };
303 298
304 regulator@1 { 299 sm0 {
305 reg = <1>;
306 regulator-compatible = "sm0";
307 regulator-name = "+1.2vs_sm0,vdd_core"; 300 regulator-name = "+1.2vs_sm0,vdd_core";
308 regulator-min-microvolt = <1200000>; 301 regulator-min-microvolt = <1200000>;
309 regulator-max-microvolt = <1200000>; 302 regulator-max-microvolt = <1200000>;
310 regulator-always-on; 303 regulator-always-on;
311 }; 304 };
312 305
313 regulator@2 { 306 sm1 {
314 reg = <2>;
315 regulator-compatible = "sm1";
316 regulator-name = "+1.0vs_sm1,vdd_cpu"; 307 regulator-name = "+1.0vs_sm1,vdd_cpu";
317 regulator-min-microvolt = <1000000>; 308 regulator-min-microvolt = <1000000>;
318 regulator-max-microvolt = <1000000>; 309 regulator-max-microvolt = <1000000>;
319 regulator-always-on; 310 regulator-always-on;
320 }; 311 };
321 312
322 sm2_reg: regulator@3 { 313 sm2_reg: sm2 {
323 reg = <3>;
324 regulator-compatible = "sm2";
325 regulator-name = "+3.7vs_sm2,vin_ldo*"; 314 regulator-name = "+3.7vs_sm2,vin_ldo*";
326 regulator-min-microvolt = <3700000>; 315 regulator-min-microvolt = <3700000>;
327 regulator-max-microvolt = <3700000>; 316 regulator-max-microvolt = <3700000>;
@@ -330,53 +319,41 @@
330 319
331 /* LDO0 is not connected to anything */ 320 /* LDO0 is not connected to anything */
332 321
333 regulator@5 { 322 ldo1 {
334 reg = <5>;
335 regulator-compatible = "ldo1";
336 regulator-name = "+1.1vs_ldo1,avdd_pll*"; 323 regulator-name = "+1.1vs_ldo1,avdd_pll*";
337 regulator-min-microvolt = <1100000>; 324 regulator-min-microvolt = <1100000>;
338 regulator-max-microvolt = <1100000>; 325 regulator-max-microvolt = <1100000>;
339 regulator-always-on; 326 regulator-always-on;
340 }; 327 };
341 328
342 regulator@6 { 329 ldo2 {
343 reg = <6>;
344 regulator-compatible = "ldo2";
345 regulator-name = "+1.2vs_ldo2,vdd_rtc"; 330 regulator-name = "+1.2vs_ldo2,vdd_rtc";
346 regulator-min-microvolt = <1200000>; 331 regulator-min-microvolt = <1200000>;
347 regulator-max-microvolt = <1200000>; 332 regulator-max-microvolt = <1200000>;
348 }; 333 };
349 334
350 regulator@7 { 335 ldo3 {
351 reg = <7>;
352 regulator-compatible = "ldo3";
353 regulator-name = "+3.3vs_ldo3,avdd_usb*"; 336 regulator-name = "+3.3vs_ldo3,avdd_usb*";
354 regulator-min-microvolt = <3300000>; 337 regulator-min-microvolt = <3300000>;
355 regulator-max-microvolt = <3300000>; 338 regulator-max-microvolt = <3300000>;
356 regulator-always-on; 339 regulator-always-on;
357 }; 340 };
358 341
359 regulator@8 { 342 ldo4 {
360 reg = <8>;
361 regulator-compatible = "ldo4";
362 regulator-name = "+1.8vs_ldo4,avdd_osc,vddio_sys"; 343 regulator-name = "+1.8vs_ldo4,avdd_osc,vddio_sys";
363 regulator-min-microvolt = <1800000>; 344 regulator-min-microvolt = <1800000>;
364 regulator-max-microvolt = <1800000>; 345 regulator-max-microvolt = <1800000>;
365 regulator-always-on; 346 regulator-always-on;
366 }; 347 };
367 348
368 regulator@9 { 349 ldo5 {
369 reg = <9>;
370 regulator-compatible = "ldo5";
371 regulator-name = "+2.85vs_ldo5,vcore_mmc"; 350 regulator-name = "+2.85vs_ldo5,vcore_mmc";
372 regulator-min-microvolt = <2850000>; 351 regulator-min-microvolt = <2850000>;
373 regulator-max-microvolt = <2850000>; 352 regulator-max-microvolt = <2850000>;
374 regulator-always-on; 353 regulator-always-on;
375 }; 354 };
376 355
377 regulator@10 { 356 ldo6 {
378 reg = <10>;
379 regulator-compatible = "ldo6";
380 /* 357 /*
381 * Research indicates this should be 358 * Research indicates this should be
382 * 1.8v; other boards that use this 359 * 1.8v; other boards that use this
@@ -390,34 +367,26 @@
390 regulator-max-microvolt = <1800000>; 367 regulator-max-microvolt = <1800000>;
391 }; 368 };
392 369
393 regulator@11 { 370 ldo7 {
394 reg = <11>;
395 regulator-compatible = "ldo7";
396 regulator-name = "+3.3vs_ldo7,avdd_hdmi"; 371 regulator-name = "+3.3vs_ldo7,avdd_hdmi";
397 regulator-min-microvolt = <3300000>; 372 regulator-min-microvolt = <3300000>;
398 regulator-max-microvolt = <3300000>; 373 regulator-max-microvolt = <3300000>;
399 }; 374 };
400 375
401 regulator@12 { 376 ldo8 {
402 reg = <12>;
403 regulator-compatible = "ldo8";
404 regulator-name = "+1.8vs_ldo8,avdd_hdmi_pll"; 377 regulator-name = "+1.8vs_ldo8,avdd_hdmi_pll";
405 regulator-min-microvolt = <1800000>; 378 regulator-min-microvolt = <1800000>;
406 regulator-max-microvolt = <1800000>; 379 regulator-max-microvolt = <1800000>;
407 }; 380 };
408 381
409 regulator@13 { 382 ldo9 {
410 reg = <13>;
411 regulator-compatible = "ldo9";
412 regulator-name = "+2.85vs_ldo9,vdd_ddr_rx"; 383 regulator-name = "+2.85vs_ldo9,vdd_ddr_rx";
413 regulator-min-microvolt = <2850000>; 384 regulator-min-microvolt = <2850000>;
414 regulator-max-microvolt = <2850000>; 385 regulator-max-microvolt = <2850000>;
415 regulator-always-on; 386 regulator-always-on;
416 }; 387 };
417 388
418 regulator@14 { 389 ldo_rtc {
419 reg = <14>;
420 regulator-compatible = "ldo_rtc";
421 regulator-name = "+3.3vs_rtc"; 390 regulator-name = "+3.3vs_rtc";
422 regulator-min-microvolt = <3300000>; 391 regulator-min-microvolt = <3300000>;
423 regulator-max-microvolt = <3300000>; 392 regulator-max-microvolt = <3300000>;
diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
index f0ba901676ac..33ae81358d8e 100644
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -395,37 +395,26 @@
395 vinldo9-supply = <&sm2_reg>; 395 vinldo9-supply = <&sm2_reg>;
396 396
397 regulators { 397 regulators {
398 #address-cells = <1>; 398 sys_reg: sys {
399 #size-cells = <0>;
400
401 sys_reg: regulator@0 {
402 reg = <0>;
403 regulator-compatible = "sys";
404 regulator-name = "vdd_sys"; 399 regulator-name = "vdd_sys";
405 regulator-always-on; 400 regulator-always-on;
406 }; 401 };
407 402
408 regulator@1 { 403 sm0 {
409 reg = <1>;
410 regulator-compatible = "sm0";
411 regulator-name = "vdd_sm0,vdd_core"; 404 regulator-name = "vdd_sm0,vdd_core";
412 regulator-min-microvolt = <1300000>; 405 regulator-min-microvolt = <1300000>;
413 regulator-max-microvolt = <1300000>; 406 regulator-max-microvolt = <1300000>;
414 regulator-always-on; 407 regulator-always-on;
415 }; 408 };
416 409
417 regulator@2 { 410 sm1 {
418 reg = <2>;
419 regulator-compatible = "sm1";
420 regulator-name = "vdd_sm1,vdd_cpu"; 411 regulator-name = "vdd_sm1,vdd_cpu";
421 regulator-min-microvolt = <1125000>; 412 regulator-min-microvolt = <1125000>;
422 regulator-max-microvolt = <1125000>; 413 regulator-max-microvolt = <1125000>;
423 regulator-always-on; 414 regulator-always-on;
424 }; 415 };
425 416
426 sm2_reg: regulator@3 { 417 sm2_reg: sm2 {
427 reg = <3>;
428 regulator-compatible = "sm2";
429 regulator-name = "vdd_sm2,vin_ldo*"; 418 regulator-name = "vdd_sm2,vin_ldo*";
430 regulator-min-microvolt = <3700000>; 419 regulator-min-microvolt = <3700000>;
431 regulator-max-microvolt = <3700000>; 420 regulator-max-microvolt = <3700000>;
@@ -434,86 +423,66 @@
434 423
435 /* LDO0 is not connected to anything */ 424 /* LDO0 is not connected to anything */
436 425
437 regulator@5 { 426 ldo1 {
438 reg = <5>;
439 regulator-compatible = "ldo1";
440 regulator-name = "vdd_ldo1,avdd_pll*"; 427 regulator-name = "vdd_ldo1,avdd_pll*";
441 regulator-min-microvolt = <1100000>; 428 regulator-min-microvolt = <1100000>;
442 regulator-max-microvolt = <1100000>; 429 regulator-max-microvolt = <1100000>;
443 regulator-always-on; 430 regulator-always-on;
444 }; 431 };
445 432
446 regulator@6 { 433 ldo2 {
447 reg = <6>;
448 regulator-compatible = "ldo2";
449 regulator-name = "vdd_ldo2,vdd_rtc"; 434 regulator-name = "vdd_ldo2,vdd_rtc";
450 regulator-min-microvolt = <1200000>; 435 regulator-min-microvolt = <1200000>;
451 regulator-max-microvolt = <1200000>; 436 regulator-max-microvolt = <1200000>;
452 }; 437 };
453 438
454 regulator@7 { 439 ldo3 {
455 reg = <7>;
456 regulator-compatible = "ldo3";
457 regulator-name = "vdd_ldo3,avdd_usb*"; 440 regulator-name = "vdd_ldo3,avdd_usb*";
458 regulator-min-microvolt = <3300000>; 441 regulator-min-microvolt = <3300000>;
459 regulator-max-microvolt = <3300000>; 442 regulator-max-microvolt = <3300000>;
460 regulator-always-on; 443 regulator-always-on;
461 }; 444 };
462 445
463 regulator@8 { 446 ldo4 {
464 reg = <8>;
465 regulator-compatible = "ldo4";
466 regulator-name = "vdd_ldo4,avdd_osc,vddio_sys"; 447 regulator-name = "vdd_ldo4,avdd_osc,vddio_sys";
467 regulator-min-microvolt = <1800000>; 448 regulator-min-microvolt = <1800000>;
468 regulator-max-microvolt = <1800000>; 449 regulator-max-microvolt = <1800000>;
469 regulator-always-on; 450 regulator-always-on;
470 }; 451 };
471 452
472 regulator@9 { 453 ldo5 {
473 reg = <9>;
474 regulator-compatible = "ldo5";
475 regulator-name = "vdd_ldo5,vcore_mmc"; 454 regulator-name = "vdd_ldo5,vcore_mmc";
476 regulator-min-microvolt = <2850000>; 455 regulator-min-microvolt = <2850000>;
477 regulator-max-microvolt = <2850000>; 456 regulator-max-microvolt = <2850000>;
478 regulator-always-on; 457 regulator-always-on;
479 }; 458 };
480 459
481 regulator@10 { 460 ldo6 {
482 reg = <10>;
483 regulator-compatible = "ldo6";
484 regulator-name = "vdd_ldo6,avdd_vdac,vddio_vi,vddio_cam"; 461 regulator-name = "vdd_ldo6,avdd_vdac,vddio_vi,vddio_cam";
485 regulator-min-microvolt = <1800000>; 462 regulator-min-microvolt = <1800000>;
486 regulator-max-microvolt = <1800000>; 463 regulator-max-microvolt = <1800000>;
487 }; 464 };
488 465
489 regulator@11 { 466 ldo7 {
490 reg = <11>;
491 regulator-compatible = "ldo7";
492 regulator-name = "vdd_ldo7,avdd_hdmi,vdd_fuse"; 467 regulator-name = "vdd_ldo7,avdd_hdmi,vdd_fuse";
493 regulator-min-microvolt = <3300000>; 468 regulator-min-microvolt = <3300000>;
494 regulator-max-microvolt = <3300000>; 469 regulator-max-microvolt = <3300000>;
495 }; 470 };
496 471
497 regulator@12 { 472 ldo8 {
498 reg = <12>;
499 regulator-compatible = "ldo8";
500 regulator-name = "vdd_ldo8,avdd_hdmi_pll"; 473 regulator-name = "vdd_ldo8,avdd_hdmi_pll";
501 regulator-min-microvolt = <1800000>; 474 regulator-min-microvolt = <1800000>;
502 regulator-max-microvolt = <1800000>; 475 regulator-max-microvolt = <1800000>;
503 }; 476 };
504 477
505 regulator@13 { 478 ldo9 {
506 reg = <13>;
507 regulator-compatible = "ldo9";
508 regulator-name = "vdd_ldo9,avdd_2v85,vdd_ddr_rx"; 479 regulator-name = "vdd_ldo9,avdd_2v85,vdd_ddr_rx";
509 regulator-min-microvolt = <2850000>; 480 regulator-min-microvolt = <2850000>;
510 regulator-max-microvolt = <2850000>; 481 regulator-max-microvolt = <2850000>;
511 regulator-always-on; 482 regulator-always-on;
512 }; 483 };
513 484
514 regulator@14 { 485 ldo_rtc {
515 reg = <14>;
516 regulator-compatible = "ldo_rtc";
517 regulator-name = "vdd_rtc_out,vdd_cell"; 486 regulator-name = "vdd_rtc_out,vdd_cell";
518 regulator-min-microvolt = <3300000>; 487 regulator-min-microvolt = <3300000>;
519 regulator-max-microvolt = <3300000>; 488 regulator-max-microvolt = <3300000>;
diff --git a/arch/arm/boot/dts/tegra20-tamonten.dtsi b/arch/arm/boot/dts/tegra20-tamonten.dtsi
index f18cec9f6a77..5b3d8b157b33 100644
--- a/arch/arm/boot/dts/tegra20-tamonten.dtsi
+++ b/arch/arm/boot/dts/tegra20-tamonten.dtsi
@@ -271,97 +271,72 @@
271 vinldo9-supply = <&sm2_reg>; 271 vinldo9-supply = <&sm2_reg>;
272 272
273 regulators { 273 regulators {
274 #address-cells = <1>; 274 sys_reg: sys {
275 #size-cells = <0>;
276
277 sys_reg: regulator@0 {
278 reg = <0>;
279 regulator-compatible = "sys";
280 regulator-name = "vdd_sys"; 275 regulator-name = "vdd_sys";
281 regulator-always-on; 276 regulator-always-on;
282 }; 277 };
283 278
284 regulator@1 { 279 sm0 {
285 reg = <1>;
286 regulator-compatible = "sm0";
287 regulator-name = "vdd_sys_sm0,vdd_core"; 280 regulator-name = "vdd_sys_sm0,vdd_core";
288 regulator-min-microvolt = <1200000>; 281 regulator-min-microvolt = <1200000>;
289 regulator-max-microvolt = <1200000>; 282 regulator-max-microvolt = <1200000>;
290 regulator-always-on; 283 regulator-always-on;
291 }; 284 };
292 285
293 regulator@2 { 286 sm1 {
294 reg = <2>;
295 regulator-compatible = "sm1";
296 regulator-name = "vdd_sys_sm1,vdd_cpu"; 287 regulator-name = "vdd_sys_sm1,vdd_cpu";
297 regulator-min-microvolt = <1000000>; 288 regulator-min-microvolt = <1000000>;
298 regulator-max-microvolt = <1000000>; 289 regulator-max-microvolt = <1000000>;
299 regulator-always-on; 290 regulator-always-on;
300 }; 291 };
301 292
302 sm2_reg: regulator@3 { 293 sm2_reg: sm2 {
303 reg = <3>;
304 regulator-compatible = "sm2";
305 regulator-name = "vdd_sys_sm2,vin_ldo*"; 294 regulator-name = "vdd_sys_sm2,vin_ldo*";
306 regulator-min-microvolt = <3700000>; 295 regulator-min-microvolt = <3700000>;
307 regulator-max-microvolt = <3700000>; 296 regulator-max-microvolt = <3700000>;
308 regulator-always-on; 297 regulator-always-on;
309 }; 298 };
310 299
311 regulator@4 { 300 ldo0 {
312 reg = <4>;
313 regulator-compatible = "ldo0";
314 regulator-name = "vdd_ldo0,vddio_pex_clk"; 301 regulator-name = "vdd_ldo0,vddio_pex_clk";
315 regulator-min-microvolt = <3300000>; 302 regulator-min-microvolt = <3300000>;
316 regulator-max-microvolt = <3300000>; 303 regulator-max-microvolt = <3300000>;
317 }; 304 };
318 305
319 regulator@5 { 306 ldo1 {
320 reg = <5>;
321 regulator-compatible = "ldo1";
322 regulator-name = "vdd_ldo1,avdd_pll*"; 307 regulator-name = "vdd_ldo1,avdd_pll*";
323 regulator-min-microvolt = <1100000>; 308 regulator-min-microvolt = <1100000>;
324 regulator-max-microvolt = <1100000>; 309 regulator-max-microvolt = <1100000>;
325 regulator-always-on; 310 regulator-always-on;
326 }; 311 };
327 312
328 regulator@6 { 313 ldo2 {
329 reg = <6>;
330 regulator-compatible = "ldo2";
331 regulator-name = "vdd_ldo2,vdd_rtc"; 314 regulator-name = "vdd_ldo2,vdd_rtc";
332 regulator-min-microvolt = <1200000>; 315 regulator-min-microvolt = <1200000>;
333 regulator-max-microvolt = <1200000>; 316 regulator-max-microvolt = <1200000>;
334 }; 317 };
335 318
336 regulator@7 { 319 ldo3 {
337 reg = <7>;
338 regulator-compatible = "ldo3";
339 regulator-name = "vdd_ldo3,avdd_usb*"; 320 regulator-name = "vdd_ldo3,avdd_usb*";
340 regulator-min-microvolt = <3300000>; 321 regulator-min-microvolt = <3300000>;
341 regulator-max-microvolt = <3300000>; 322 regulator-max-microvolt = <3300000>;
342 regulator-always-on; 323 regulator-always-on;
343 }; 324 };
344 325
345 regulator@8 { 326 ldo4 {
346 reg = <8>;
347 regulator-compatible = "ldo4";
348 regulator-name = "vdd_ldo4,avdd_osc,vddio_sys"; 327 regulator-name = "vdd_ldo4,avdd_osc,vddio_sys";
349 regulator-min-microvolt = <1800000>; 328 regulator-min-microvolt = <1800000>;
350 regulator-max-microvolt = <1800000>; 329 regulator-max-microvolt = <1800000>;
351 regulator-always-on; 330 regulator-always-on;
352 }; 331 };
353 332
354 regulator@9 { 333 ldo5 {
355 reg = <9>;
356 regulator-compatible = "ldo5";
357 regulator-name = "vdd_ldo5,vcore_mmc"; 334 regulator-name = "vdd_ldo5,vcore_mmc";
358 regulator-min-microvolt = <2850000>; 335 regulator-min-microvolt = <2850000>;
359 regulator-max-microvolt = <2850000>; 336 regulator-max-microvolt = <2850000>;
360 }; 337 };
361 338
362 regulator@10 { 339 ldo6 {
363 reg = <10>;
364 regulator-compatible = "ldo6";
365 regulator-name = "vdd_ldo6,avdd_vdac"; 340 regulator-name = "vdd_ldo6,avdd_vdac";
366 /* 341 /*
367 * According to the Tegra 2 Automotive 342 * According to the Tegra 2 Automotive
@@ -373,25 +348,19 @@
373 regulator-max-microvolt = <2850000>; 348 regulator-max-microvolt = <2850000>;
374 }; 349 };
375 350
376 regulator@11 { 351 ldo7 {
377 reg = <11>;
378 regulator-compatible = "ldo7";
379 regulator-name = "vdd_ldo7,avdd_hdmi"; 352 regulator-name = "vdd_ldo7,avdd_hdmi";
380 regulator-min-microvolt = <3300000>; 353 regulator-min-microvolt = <3300000>;
381 regulator-max-microvolt = <3300000>; 354 regulator-max-microvolt = <3300000>;
382 }; 355 };
383 356
384 regulator@12 { 357 ldo8 {
385 reg = <12>;
386 regulator-compatible = "ldo8";
387 regulator-name = "vdd_ldo8,avdd_hdmi_pll"; 358 regulator-name = "vdd_ldo8,avdd_hdmi_pll";
388 regulator-min-microvolt = <1800000>; 359 regulator-min-microvolt = <1800000>;
389 regulator-max-microvolt = <1800000>; 360 regulator-max-microvolt = <1800000>;
390 }; 361 };
391 362
392 regulator@13 { 363 ldo9 {
393 reg = <13>;
394 regulator-compatible = "ldo9";
395 regulator-name = "vdd_ldo9,vdd_ddr_rx,avdd_cam"; 364 regulator-name = "vdd_ldo9,vdd_ddr_rx,avdd_cam";
396 /* 365 /*
397 * According to the Tegra 2 Automotive 366 * According to the Tegra 2 Automotive
@@ -404,9 +373,7 @@
404 regulator-always-on; 373 regulator-always-on;
405 }; 374 };
406 375
407 regulator@14 { 376 ldo_rtc {
408 reg = <14>;
409 regulator-compatible = "ldo_rtc";
410 regulator-name = "vdd_rtc_out"; 377 regulator-name = "vdd_rtc_out";
411 regulator-min-microvolt = <3300000>; 378 regulator-min-microvolt = <3300000>;
412 regulator-max-microvolt = <3300000>; 379 regulator-max-microvolt = <3300000>;
diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts
index 3e5952fcfbc5..86854f1abd58 100644
--- a/arch/arm/boot/dts/tegra20-ventana.dts
+++ b/arch/arm/boot/dts/tegra20-ventana.dts
@@ -311,37 +311,26 @@
311 vinldo9-supply = <&sm2_reg>; 311 vinldo9-supply = <&sm2_reg>;
312 312
313 regulators { 313 regulators {
314 #address-cells = <1>; 314 sys_reg: sys {
315 #size-cells = <0>;
316
317 sys_reg: regulator@0 {
318 reg = <0>;
319 regulator-compatible = "sys";
320 regulator-name = "vdd_sys"; 315 regulator-name = "vdd_sys";
321 regulator-always-on; 316 regulator-always-on;
322 }; 317 };
323 318
324 regulator@1 { 319 sm0 {
325 reg = <1>;
326 regulator-compatible = "sm0";
327 regulator-name = "vdd_sm0,vdd_core"; 320 regulator-name = "vdd_sm0,vdd_core";
328 regulator-min-microvolt = <1200000>; 321 regulator-min-microvolt = <1200000>;
329 regulator-max-microvolt = <1200000>; 322 regulator-max-microvolt = <1200000>;
330 regulator-always-on; 323 regulator-always-on;
331 }; 324 };
332 325
333 regulator@2 { 326 sm1 {
334 reg = <2>;
335 regulator-compatible = "sm1";
336 regulator-name = "vdd_sm1,vdd_cpu"; 327 regulator-name = "vdd_sm1,vdd_cpu";
337 regulator-min-microvolt = <1000000>; 328 regulator-min-microvolt = <1000000>;
338 regulator-max-microvolt = <1000000>; 329 regulator-max-microvolt = <1000000>;
339 regulator-always-on; 330 regulator-always-on;
340 }; 331 };
341 332
342 sm2_reg: regulator@3 { 333 sm2_reg: sm2 {
343 reg = <3>;
344 regulator-compatible = "sm2";
345 regulator-name = "vdd_sm2,vin_ldo*"; 334 regulator-name = "vdd_sm2,vin_ldo*";
346 regulator-min-microvolt = <3700000>; 335 regulator-min-microvolt = <3700000>;
347 regulator-max-microvolt = <3700000>; 336 regulator-max-microvolt = <3700000>;
@@ -350,86 +339,66 @@
350 339
351 /* LDO0 is not connected to anything */ 340 /* LDO0 is not connected to anything */
352 341
353 regulator@5 { 342 ldo1 {
354 reg = <5>;
355 regulator-compatible = "ldo1";
356 regulator-name = "vdd_ldo1,avdd_pll*"; 343 regulator-name = "vdd_ldo1,avdd_pll*";
357 regulator-min-microvolt = <1100000>; 344 regulator-min-microvolt = <1100000>;
358 regulator-max-microvolt = <1100000>; 345 regulator-max-microvolt = <1100000>;
359 regulator-always-on; 346 regulator-always-on;
360 }; 347 };
361 348
362 regulator@6 { 349 ldo2 {
363 reg = <6>;
364 regulator-compatible = "ldo2";
365 regulator-name = "vdd_ldo2,vdd_rtc"; 350 regulator-name = "vdd_ldo2,vdd_rtc";
366 regulator-min-microvolt = <1200000>; 351 regulator-min-microvolt = <1200000>;
367 regulator-max-microvolt = <1200000>; 352 regulator-max-microvolt = <1200000>;
368 }; 353 };
369 354
370 regulator@7 { 355 ldo3 {
371 reg = <7>;
372 regulator-compatible = "ldo3";
373 regulator-name = "vdd_ldo3,avdd_usb*"; 356 regulator-name = "vdd_ldo3,avdd_usb*";
374 regulator-min-microvolt = <3300000>; 357 regulator-min-microvolt = <3300000>;
375 regulator-max-microvolt = <3300000>; 358 regulator-max-microvolt = <3300000>;
376 regulator-always-on; 359 regulator-always-on;
377 }; 360 };
378 361
379 regulator@8 { 362 ldo4 {
380 reg = <8>;
381 regulator-compatible = "ldo4";
382 regulator-name = "vdd_ldo4,avdd_osc,vddio_sys"; 363 regulator-name = "vdd_ldo4,avdd_osc,vddio_sys";
383 regulator-min-microvolt = <1800000>; 364 regulator-min-microvolt = <1800000>;
384 regulator-max-microvolt = <1800000>; 365 regulator-max-microvolt = <1800000>;
385 regulator-always-on; 366 regulator-always-on;
386 }; 367 };
387 368
388 regulator@9 { 369 ldo5 {
389 reg = <9>;
390 regulator-compatible = "ldo5";
391 regulator-name = "vdd_ldo5,vcore_mmc"; 370 regulator-name = "vdd_ldo5,vcore_mmc";
392 regulator-min-microvolt = <2850000>; 371 regulator-min-microvolt = <2850000>;
393 regulator-max-microvolt = <2850000>; 372 regulator-max-microvolt = <2850000>;
394 regulator-always-on; 373 regulator-always-on;
395 }; 374 };
396 375
397 regulator@10 { 376 ldo6 {
398 reg = <10>;
399 regulator-compatible = "ldo6";
400 regulator-name = "vdd_ldo6,avdd_vdac"; 377 regulator-name = "vdd_ldo6,avdd_vdac";
401 regulator-min-microvolt = <1800000>; 378 regulator-min-microvolt = <1800000>;
402 regulator-max-microvolt = <1800000>; 379 regulator-max-microvolt = <1800000>;
403 }; 380 };
404 381
405 regulator@11 { 382 ldo7 {
406 reg = <11>;
407 regulator-compatible = "ldo7";
408 regulator-name = "vdd_ldo7,avdd_hdmi,vdd_fuse"; 383 regulator-name = "vdd_ldo7,avdd_hdmi,vdd_fuse";
409 regulator-min-microvolt = <3300000>; 384 regulator-min-microvolt = <3300000>;
410 regulator-max-microvolt = <3300000>; 385 regulator-max-microvolt = <3300000>;
411 }; 386 };
412 387
413 regulator@12 { 388 ldo8 {
414 reg = <12>;
415 regulator-compatible = "ldo8";
416 regulator-name = "vdd_ldo8,avdd_hdmi_pll"; 389 regulator-name = "vdd_ldo8,avdd_hdmi_pll";
417 regulator-min-microvolt = <1800000>; 390 regulator-min-microvolt = <1800000>;
418 regulator-max-microvolt = <1800000>; 391 regulator-max-microvolt = <1800000>;
419 }; 392 };
420 393
421 regulator@13 { 394 ldo9 {
422 reg = <13>;
423 regulator-compatible = "ldo9";
424 regulator-name = "vdd_ldo9,avdd_2v85,vdd_ddr_rx"; 395 regulator-name = "vdd_ldo9,avdd_2v85,vdd_ddr_rx";
425 regulator-min-microvolt = <2850000>; 396 regulator-min-microvolt = <2850000>;
426 regulator-max-microvolt = <2850000>; 397 regulator-max-microvolt = <2850000>;
427 regulator-always-on; 398 regulator-always-on;
428 }; 399 };
429 400
430 regulator@14 { 401 ldo_rtc {
431 reg = <14>;
432 regulator-compatible = "ldo_rtc";
433 regulator-name = "vdd_rtc_out,vdd_cell"; 402 regulator-name = "vdd_rtc_out,vdd_cell";
434 regulator-min-microvolt = <3300000>; 403 regulator-min-microvolt = <3300000>;
435 regulator-max-microvolt = <3300000>; 404 regulator-max-microvolt = <3300000>;
diff --git a/arch/arm/boot/dts/tegra20-whistler.dts b/arch/arm/boot/dts/tegra20-whistler.dts
index c636d002d6d8..94a71c91beb5 100644
--- a/arch/arm/boot/dts/tegra20-whistler.dts
+++ b/arch/arm/boot/dts/tegra20-whistler.dts
@@ -295,243 +295,182 @@
295 in20-supply = <&mbatt_reg>; 295 in20-supply = <&mbatt_reg>;
296 296
297 regulators { 297 regulators {
298 #address-cells = <1>; 298 mbatt_reg: mbatt {
299 #size-cells = <0>;
300
301 mbatt_reg: regulator@0 {
302 reg = <0>;
303 regulator-compatible = "mbatt";
304 regulator-name = "vbat_pmu"; 299 regulator-name = "vbat_pmu";
305 regulator-always-on; 300 regulator-always-on;
306 }; 301 };
307 302
308 regulator@1 { 303 sd1 {
309 reg = <1>;
310 regulator-compatible = "sd1";
311 regulator-name = "nvvdd_sv1,vdd_cpu_pmu"; 304 regulator-name = "nvvdd_sv1,vdd_cpu_pmu";
312 regulator-min-microvolt = <1000000>; 305 regulator-min-microvolt = <1000000>;
313 regulator-max-microvolt = <1000000>; 306 regulator-max-microvolt = <1000000>;
314 regulator-always-on; 307 regulator-always-on;
315 }; 308 };
316 309
317 regulator@2 { 310 sd2 {
318 reg = <2>;
319 regulator-compatible = "sd2";
320 regulator-name = "nvvdd_sv2,vdd_core"; 311 regulator-name = "nvvdd_sv2,vdd_core";
321 regulator-min-microvolt = <1200000>; 312 regulator-min-microvolt = <1200000>;
322 regulator-max-microvolt = <1200000>; 313 regulator-max-microvolt = <1200000>;
323 regulator-always-on; 314 regulator-always-on;
324 }; 315 };
325 316
326 nvvdd_sv3_reg: regulator@3 { 317 nvvdd_sv3_reg: sd3 {
327 reg = <3>;
328 regulator-compatible = "sd3";
329 regulator-name = "nvvdd_sv3"; 318 regulator-name = "nvvdd_sv3";
330 regulator-min-microvolt = <1800000>; 319 regulator-min-microvolt = <1800000>;
331 regulator-max-microvolt = <1800000>; 320 regulator-max-microvolt = <1800000>;
332 regulator-always-on; 321 regulator-always-on;
333 }; 322 };
334 323
335 regulator@4 { 324 ldo1 {
336 reg = <4>;
337 regulator-compatible = "ldo1";
338 regulator-name = "nvvdd_ldo1,vddio_rx_ddr,vcore_acc"; 325 regulator-name = "nvvdd_ldo1,vddio_rx_ddr,vcore_acc";
339 regulator-min-microvolt = <3300000>; 326 regulator-min-microvolt = <3300000>;
340 regulator-max-microvolt = <3300000>; 327 regulator-max-microvolt = <3300000>;
341 regulator-always-on; 328 regulator-always-on;
342 }; 329 };
343 330
344 regulator@5 { 331 ldo2 {
345 reg = <5>;
346 regulator-compatible = "ldo2";
347 regulator-name = "nvvdd_ldo2,avdd_pll*"; 332 regulator-name = "nvvdd_ldo2,avdd_pll*";
348 regulator-min-microvolt = <1100000>; 333 regulator-min-microvolt = <1100000>;
349 regulator-max-microvolt = <1100000>; 334 regulator-max-microvolt = <1100000>;
350 regulator-always-on; 335 regulator-always-on;
351 }; 336 };
352 337
353 regulator@6 { 338 ldo3 {
354 reg = <6>;
355 regulator-compatible = "ldo3";
356 regulator-name = "nvvdd_ldo3,vcom_1v8b"; 339 regulator-name = "nvvdd_ldo3,vcom_1v8b";
357 regulator-min-microvolt = <1800000>; 340 regulator-min-microvolt = <1800000>;
358 regulator-max-microvolt = <1800000>; 341 regulator-max-microvolt = <1800000>;
359 regulator-always-on; 342 regulator-always-on;
360 }; 343 };
361 344
362 regulator@7 { 345 ldo4 {
363 reg = <7>;
364 regulator-compatible = "ldo4";
365 regulator-name = "nvvdd_ldo4,avdd_usb*"; 346 regulator-name = "nvvdd_ldo4,avdd_usb*";
366 regulator-min-microvolt = <3300000>; 347 regulator-min-microvolt = <3300000>;
367 regulator-max-microvolt = <3300000>; 348 regulator-max-microvolt = <3300000>;
368 regulator-always-on; 349 regulator-always-on;
369 }; 350 };
370 351
371 regulator@8 { 352 ldo5 {
372 reg = <8>;
373 regulator-compatible = "ldo5";
374 regulator-name = "nvvdd_ldo5,vcore_mmc,avdd_lcd1,vddio_1wire"; 353 regulator-name = "nvvdd_ldo5,vcore_mmc,avdd_lcd1,vddio_1wire";
375 regulator-min-microvolt = <2800000>; 354 regulator-min-microvolt = <2800000>;
376 regulator-max-microvolt = <2800000>; 355 regulator-max-microvolt = <2800000>;
377 regulator-always-on; 356 regulator-always-on;
378 }; 357 };
379 358
380 regulator@9 { 359 ldo6 {
381 reg = <9>;
382 regulator-compatible = "ldo6";
383 regulator-name = "nvvdd_ldo6,avdd_hdmi_pll"; 360 regulator-name = "nvvdd_ldo6,avdd_hdmi_pll";
384 regulator-min-microvolt = <1800000>; 361 regulator-min-microvolt = <1800000>;
385 regulator-max-microvolt = <1800000>; 362 regulator-max-microvolt = <1800000>;
386 }; 363 };
387 364
388 regulator@10 { 365 ldo7 {
389 reg = <10>;
390 regulator-compatible = "ldo7";
391 regulator-name = "nvvdd_ldo7,avddio_audio"; 366 regulator-name = "nvvdd_ldo7,avddio_audio";
392 regulator-min-microvolt = <2800000>; 367 regulator-min-microvolt = <2800000>;
393 regulator-max-microvolt = <2800000>; 368 regulator-max-microvolt = <2800000>;
394 regulator-always-on; 369 regulator-always-on;
395 }; 370 };
396 371
397 regulator@11 { 372 ldo8 {
398 reg = <11>;
399 regulator-compatible = "ldo8";
400 regulator-name = "nvvdd_ldo8,vcom_3v0,vcore_cmps"; 373 regulator-name = "nvvdd_ldo8,vcom_3v0,vcore_cmps";
401 regulator-min-microvolt = <3000000>; 374 regulator-min-microvolt = <3000000>;
402 regulator-max-microvolt = <3000000>; 375 regulator-max-microvolt = <3000000>;
403 }; 376 };
404 377
405 regulator@12 { 378 ldo9 {
406 reg = <12>;
407 regulator-compatible = "ldo9";
408 regulator-name = "nvvdd_ldo9,avdd_cam*"; 379 regulator-name = "nvvdd_ldo9,avdd_cam*";
409 regulator-min-microvolt = <2800000>; 380 regulator-min-microvolt = <2800000>;
410 regulator-max-microvolt = <2800000>; 381 regulator-max-microvolt = <2800000>;
411 }; 382 };
412 383
413 regulator@13 { 384 ldo10 {
414 reg = <13>;
415 regulator-compatible = "ldo10";
416 regulator-name = "nvvdd_ldo10,avdd_usb_ic_3v0"; 385 regulator-name = "nvvdd_ldo10,avdd_usb_ic_3v0";
417 regulator-min-microvolt = <3000000>; 386 regulator-min-microvolt = <3000000>;
418 regulator-max-microvolt = <3000000>; 387 regulator-max-microvolt = <3000000>;
419 regulator-always-on; 388 regulator-always-on;
420 }; 389 };
421 390
422 regulator@14 { 391 ldo11 {
423 reg = <14>;
424 regulator-compatible = "ldo11";
425 regulator-name = "nvvdd_ldo11,vddio_pex_clk,vcom_33,avdd_hdmi"; 392 regulator-name = "nvvdd_ldo11,vddio_pex_clk,vcom_33,avdd_hdmi";
426 regulator-min-microvolt = <3300000>; 393 regulator-min-microvolt = <3300000>;
427 regulator-max-microvolt = <3300000>; 394 regulator-max-microvolt = <3300000>;
428 }; 395 };
429 396
430 regulator@15 { 397 ldo12 {
431 reg = <15>;
432 regulator-compatible = "ldo12";
433 regulator-name = "nvvdd_ldo12,vddio_sdio"; 398 regulator-name = "nvvdd_ldo12,vddio_sdio";
434 regulator-min-microvolt = <2800000>; 399 regulator-min-microvolt = <2800000>;
435 regulator-max-microvolt = <2800000>; 400 regulator-max-microvolt = <2800000>;
436 regulator-always-on; 401 regulator-always-on;
437 }; 402 };
438 403
439 regulator@16 { 404 ldo13 {
440 reg = <16>;
441 regulator-compatible = "ldo13";
442 regulator-name = "nvvdd_ldo13,vcore_phtn,vdd_af"; 405 regulator-name = "nvvdd_ldo13,vcore_phtn,vdd_af";
443 regulator-min-microvolt = <2800000>; 406 regulator-min-microvolt = <2800000>;
444 regulator-max-microvolt = <2800000>; 407 regulator-max-microvolt = <2800000>;
445 }; 408 };
446 409
447 regulator@17 { 410 ldo14 {
448 reg = <17>;
449 regulator-compatible = "ldo14";
450 regulator-name = "nvvdd_ldo14,avdd_vdac"; 411 regulator-name = "nvvdd_ldo14,avdd_vdac";
451 regulator-min-microvolt = <2800000>; 412 regulator-min-microvolt = <2800000>;
452 regulator-max-microvolt = <2800000>; 413 regulator-max-microvolt = <2800000>;
453 }; 414 };
454 415
455 regulator@18 { 416 ldo15 {
456 reg = <18>;
457 regulator-compatible = "ldo15";
458 regulator-name = "nvvdd_ldo15,vcore_temp,vddio_hdcp"; 417 regulator-name = "nvvdd_ldo15,vcore_temp,vddio_hdcp";
459 regulator-min-microvolt = <3300000>; 418 regulator-min-microvolt = <3300000>;
460 regulator-max-microvolt = <3300000>; 419 regulator-max-microvolt = <3300000>;
461 }; 420 };
462 421
463 regulator@19 { 422 ldo16 {
464 reg = <19>;
465 regulator-compatible = "ldo16";
466 regulator-name = "nvvdd_ldo16,vdd_dbrtr"; 423 regulator-name = "nvvdd_ldo16,vdd_dbrtr";
467 regulator-min-microvolt = <1300000>; 424 regulator-min-microvolt = <1300000>;
468 regulator-max-microvolt = <1300000>; 425 regulator-max-microvolt = <1300000>;
469 }; 426 };
470 427
471 regulator@20 { 428 ldo17 {
472 reg = <20>;
473 regulator-compatible = "ldo17";
474 regulator-name = "nvvdd_ldo17,vddio_mipi"; 429 regulator-name = "nvvdd_ldo17,vddio_mipi";
475 regulator-min-microvolt = <1200000>; 430 regulator-min-microvolt = <1200000>;
476 regulator-max-microvolt = <1200000>; 431 regulator-max-microvolt = <1200000>;
477 }; 432 };
478 433
479 regulator@21 { 434 ldo18 {
480 reg = <21>;
481 regulator-compatible = "ldo18";
482 regulator-name = "nvvdd_ldo18,vddio_vi,vcore_cam*"; 435 regulator-name = "nvvdd_ldo18,vddio_vi,vcore_cam*";
483 regulator-min-microvolt = <1800000>; 436 regulator-min-microvolt = <1800000>;
484 regulator-max-microvolt = <1800000>; 437 regulator-max-microvolt = <1800000>;
485 }; 438 };
486 439
487 regulator@22 { 440 ldo19 {
488 reg = <22>;
489 regulator-compatible = "ldo19";
490 regulator-name = "nvvdd_ldo19,avdd_lcd2,vddio_lx"; 441 regulator-name = "nvvdd_ldo19,avdd_lcd2,vddio_lx";
491 regulator-min-microvolt = <2800000>; 442 regulator-min-microvolt = <2800000>;
492 regulator-max-microvolt = <2800000>; 443 regulator-max-microvolt = <2800000>;
493 }; 444 };
494 445
495 regulator@23 { 446 ldo20 {
496 reg = <23>;
497 regulator-compatible = "ldo20";
498 regulator-name = "nvvdd_ldo20,vddio_ddr_1v2,vddio_hsic,vcom_1v2"; 447 regulator-name = "nvvdd_ldo20,vddio_ddr_1v2,vddio_hsic,vcom_1v2";
499 regulator-min-microvolt = <1200000>; 448 regulator-min-microvolt = <1200000>;
500 regulator-max-microvolt = <1200000>; 449 regulator-max-microvolt = <1200000>;
501 regulator-always-on; 450 regulator-always-on;
502 }; 451 };
503 452
504 regulator@24 { 453 out5v {
505 reg = <24>;
506 regulator-compatible = "out5v";
507 regulator-name = "usb0_vbus_reg"; 454 regulator-name = "usb0_vbus_reg";
508 }; 455 };
509 456
510 regulator@25 { 457 out33v {
511 reg = <25>;
512 regulator-compatible = "out33v";
513 regulator-name = "pmu_out3v3"; 458 regulator-name = "pmu_out3v3";
514 }; 459 };
515 460
516 regulator@26 { 461 bbat {
517 reg = <26>;
518 regulator-compatible = "bbat";
519 regulator-name = "pmu_bbat"; 462 regulator-name = "pmu_bbat";
520 regulator-min-microvolt = <2400000>; 463 regulator-min-microvolt = <2400000>;
521 regulator-max-microvolt = <2400000>; 464 regulator-max-microvolt = <2400000>;
522 regulator-always-on; 465 regulator-always-on;
523 }; 466 };
524 467
525 regulator@27 { 468 sdby {
526 reg = <27>;
527 regulator-compatible = "sdby";
528 regulator-name = "vdd_aon"; 469 regulator-name = "vdd_aon";
529 regulator-always-on; 470 regulator-always-on;
530 }; 471 };
531 472
532 regulator@28 { 473 vrtc {
533 reg = <28>;
534 regulator-compatible = "vrtc";
535 regulator-name = "vrtc,pmu_vccadc"; 474 regulator-name = "vrtc,pmu_vccadc";
536 regulator-always-on; 475 regulator-always-on;
537 }; 476 };
diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index d10c9c5a3606..b1271a894327 100644
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -171,56 +171,41 @@
171 vccio-supply = <&vdd_ac_bat_reg>; 171 vccio-supply = <&vdd_ac_bat_reg>;
172 172
173 regulators { 173 regulators {
174 #address-cells = <1>; 174 vdd1_reg: vdd1 {
175 #size-cells = <0>;
176
177 vdd1_reg: regulator@0 {
178 reg = <0>;
179 regulator-compatible = "vdd1";
180 regulator-name = "vddio_ddr_1v2"; 175 regulator-name = "vddio_ddr_1v2";
181 regulator-min-microvolt = <1200000>; 176 regulator-min-microvolt = <1200000>;
182 regulator-max-microvolt = <1200000>; 177 regulator-max-microvolt = <1200000>;
183 regulator-always-on; 178 regulator-always-on;
184 }; 179 };
185 180
186 vdd2_reg: regulator@1 { 181 vdd2_reg: vdd2 {
187 reg = <1>;
188 regulator-compatible = "vdd2";
189 regulator-name = "vdd_1v5_gen"; 182 regulator-name = "vdd_1v5_gen";
190 regulator-min-microvolt = <1500000>; 183 regulator-min-microvolt = <1500000>;
191 regulator-max-microvolt = <1500000>; 184 regulator-max-microvolt = <1500000>;
192 regulator-always-on; 185 regulator-always-on;
193 }; 186 };
194 187
195 vddctrl_reg: regulator@2 { 188 vddctrl_reg: vddctrl {
196 reg = <2>;
197 regulator-compatible = "vddctrl";
198 regulator-name = "vdd_cpu,vdd_sys"; 189 regulator-name = "vdd_cpu,vdd_sys";
199 regulator-min-microvolt = <1000000>; 190 regulator-min-microvolt = <1000000>;
200 regulator-max-microvolt = <1000000>; 191 regulator-max-microvolt = <1000000>;
201 regulator-always-on; 192 regulator-always-on;
202 }; 193 };
203 194
204 vio_reg: regulator@3 { 195 vio_reg: vio {
205 reg = <3>;
206 regulator-compatible = "vio";
207 regulator-name = "vdd_1v8_gen"; 196 regulator-name = "vdd_1v8_gen";
208 regulator-min-microvolt = <1800000>; 197 regulator-min-microvolt = <1800000>;
209 regulator-max-microvolt = <1800000>; 198 regulator-max-microvolt = <1800000>;
210 regulator-always-on; 199 regulator-always-on;
211 }; 200 };
212 201
213 ldo1_reg: regulator@4 { 202 ldo1_reg: ldo1 {
214 reg = <4>;
215 regulator-compatible = "ldo1";
216 regulator-name = "vdd_pexa,vdd_pexb"; 203 regulator-name = "vdd_pexa,vdd_pexb";
217 regulator-min-microvolt = <1050000>; 204 regulator-min-microvolt = <1050000>;
218 regulator-max-microvolt = <1050000>; 205 regulator-max-microvolt = <1050000>;
219 }; 206 };
220 207
221 ldo2_reg: regulator@5 { 208 ldo2_reg: ldo2 {
222 reg = <5>;
223 regulator-compatible = "ldo2";
224 regulator-name = "vdd_sata,avdd_plle"; 209 regulator-name = "vdd_sata,avdd_plle";
225 regulator-min-microvolt = <1050000>; 210 regulator-min-microvolt = <1050000>;
226 regulator-max-microvolt = <1050000>; 211 regulator-max-microvolt = <1050000>;
@@ -228,44 +213,34 @@
228 213
229 /* LDO3 is not connected to anything */ 214 /* LDO3 is not connected to anything */
230 215
231 ldo4_reg: regulator@7 { 216 ldo4_reg: ldo4 {
232 reg = <7>;
233 regulator-compatible = "ldo4";
234 regulator-name = "vdd_rtc"; 217 regulator-name = "vdd_rtc";
235 regulator-min-microvolt = <1200000>; 218 regulator-min-microvolt = <1200000>;
236 regulator-max-microvolt = <1200000>; 219 regulator-max-microvolt = <1200000>;
237 regulator-always-on; 220 regulator-always-on;
238 }; 221 };
239 222
240 ldo5_reg: regulator@8 { 223 ldo5_reg: ldo5 {
241 reg = <8>;
242 regulator-compatible = "ldo5";
243 regulator-name = "vddio_sdmmc,avdd_vdac"; 224 regulator-name = "vddio_sdmmc,avdd_vdac";
244 regulator-min-microvolt = <3300000>; 225 regulator-min-microvolt = <3300000>;
245 regulator-max-microvolt = <3300000>; 226 regulator-max-microvolt = <3300000>;
246 regulator-always-on; 227 regulator-always-on;
247 }; 228 };
248 229
249 ldo6_reg: regulator@9 { 230 ldo6_reg: ldo6 {
250 reg = <9>;
251 regulator-compatible = "ldo6";
252 regulator-name = "avdd_dsi_csi,pwrdet_mipi"; 231 regulator-name = "avdd_dsi_csi,pwrdet_mipi";
253 regulator-min-microvolt = <1200000>; 232 regulator-min-microvolt = <1200000>;
254 regulator-max-microvolt = <1200000>; 233 regulator-max-microvolt = <1200000>;
255 }; 234 };
256 235
257 ldo7_reg: regulator@10 { 236 ldo7_reg: ldo7 {
258 reg = <10>;
259 regulator-compatible = "ldo7";
260 regulator-name = "vdd_pllm,x,u,a_p_c_s"; 237 regulator-name = "vdd_pllm,x,u,a_p_c_s";
261 regulator-min-microvolt = <1200000>; 238 regulator-min-microvolt = <1200000>;
262 regulator-max-microvolt = <1200000>; 239 regulator-max-microvolt = <1200000>;
263 regulator-always-on; 240 regulator-always-on;
264 }; 241 };
265 242
266 ldo8_reg: regulator@11 { 243 ldo8_reg: ldo8 {
267 reg = <11>;
268 regulator-compatible = "ldo8";
269 regulator-name = "vdd_ddr_hs"; 244 regulator-name = "vdd_ddr_hs";
270 regulator-min-microvolt = <1000000>; 245 regulator-min-microvolt = <1000000>;
271 regulator-max-microvolt = <1000000>; 246 regulator-max-microvolt = <1000000>;
generated by cgit v1.2.2 (git 2.25.0) at 2026-07-07 22:58:04 -0400