aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2013-11-26 16:43:45 -0500
committerStephen Warren <swarren@nvidia.com>2013-12-16 16:09:17 -0500
commit578990537aa553a3194420e63d467fcb12d42ba4 (patch)
tree3383e63dee1bd56839d4ca5b37ad1549e131e4ce /arch/arm/boot
parent58ecb23f64ee3a2ef66bb55b2e1e841385b6d08b (diff)
ARM: tegra: fix node sort order
For Tegra DT files, I've been attempting to keep the nodes sorted in the order: 1) Nodes with reg, in order of reg. 2) Nodes without reg, alphabetically. This patch fixes a few escapees that I missed:-( The diffs look larger than they really are, because sometimes when one node was moved up or down, diff chose to represent this as many other nodes being moved the other way! Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/tegra20-colibri-512.dtsi56
-rw-r--r--arch/arm/boot/dts/tegra20-harmony.dts184
-rw-r--r--arch/arm/boot/dts/tegra20-iris-512.dts14
-rw-r--r--arch/arm/boot/dts/tegra20-seaboard.dts281
-rw-r--r--arch/arm/boot/dts/tegra20-whistler.dts26
-rw-r--r--arch/arm/boot/dts/tegra30-beaver.dts64
-rw-r--r--arch/arm/boot/dts/tegra30-cardhu-a02.dts14
-rw-r--r--arch/arm/boot/dts/tegra30-cardhu-a04.dts14
-rw-r--r--arch/arm/boot/dts/tegra30-cardhu.dtsi12
9 files changed, 333 insertions, 332 deletions
diff --git a/arch/arm/boot/dts/tegra20-colibri-512.dtsi b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
index f20fc9794e89..78f7e919ab6f 100644
--- a/arch/arm/boot/dts/tegra20-colibri-512.dtsi
+++ b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
@@ -199,6 +199,14 @@
199 }; 199 };
200 }; 200 };
201 201
202 ac97: ac97@70002000 {
203 status = "okay";
204 nvidia,codec-reset-gpio = <&gpio TEGRA_GPIO(V, 0)
205 GPIO_ACTIVE_HIGH>;
206 nvidia,codec-sync-gpio = <&gpio TEGRA_GPIO(P, 0)
207 GPIO_ACTIVE_HIGH>;
208 };
209
202 i2c@7000c000 { 210 i2c@7000c000 {
203 clock-frequency = <400000>; 211 clock-frequency = <400000>;
204 }; 212 };
@@ -442,14 +450,6 @@
442 }; 450 };
443 }; 451 };
444 452
445 ac97: ac97@70002000 {
446 status = "okay";
447 nvidia,codec-reset-gpio = <&gpio TEGRA_GPIO(V, 0)
448 GPIO_ACTIVE_HIGH>;
449 nvidia,codec-sync-gpio = <&gpio TEGRA_GPIO(P, 0)
450 GPIO_ACTIVE_HIGH>;
451 };
452
453 usb@c5004000 { 453 usb@c5004000 {
454 status = "okay"; 454 status = "okay";
455 nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1) 455 nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
@@ -479,26 +479,6 @@
479 }; 479 };
480 }; 480 };
481 481
482 sound {
483 compatible = "nvidia,tegra-audio-wm9712-colibri_t20",
484 "nvidia,tegra-audio-wm9712";
485 nvidia,model = "Colibri T20 AC97 Audio";
486
487 nvidia,audio-routing =
488 "Headphone", "HPOUTL",
489 "Headphone", "HPOUTR",
490 "LineIn", "LINEINL",
491 "LineIn", "LINEINR",
492 "Mic", "MIC1";
493
494 nvidia,ac97-controller = <&ac97>;
495
496 clocks = <&tegra_car TEGRA20_CLK_PLL_A>,
497 <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
498 <&tegra_car TEGRA20_CLK_CDEV1>;
499 clock-names = "pll_a", "pll_a_out0", "mclk";
500 };
501
502 regulators { 482 regulators {
503 compatible = "simple-bus"; 483 compatible = "simple-bus";
504 #address-cells = <1>; 484 #address-cells = <1>;
@@ -525,4 +505,24 @@
525 gpio = <&gpio TEGRA_GPIO(BB, 1) GPIO_ACTIVE_HIGH>; 505 gpio = <&gpio TEGRA_GPIO(BB, 1) GPIO_ACTIVE_HIGH>;
526 }; 506 };
527 }; 507 };
508
509 sound {
510 compatible = "nvidia,tegra-audio-wm9712-colibri_t20",
511 "nvidia,tegra-audio-wm9712";
512 nvidia,model = "Colibri T20 AC97 Audio";
513
514 nvidia,audio-routing =
515 "Headphone", "HPOUTL",
516 "Headphone", "HPOUTR",
517 "LineIn", "LINEINL",
518 "LineIn", "LINEINR",
519 "Mic", "MIC1";
520
521 nvidia,ac97-controller = <&ac97>;
522
523 clocks = <&tegra_car TEGRA20_CLK_PLL_A>,
524 <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
525 <&tegra_car TEGRA20_CLK_CDEV1>;
526 clock-names = "pll_a", "pll_a_out0", "mclk";
527 };
528}; 528};
diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index b9c6f67e87ef..94d2189a47a7 100644
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -415,98 +415,6 @@
415 }; 415 };
416 }; 416 };
417 417
418 pmc@7000e400 {
419 nvidia,invert-interrupt;
420 nvidia,suspend-mode = <1>;
421 nvidia,cpu-pwr-good-time = <5000>;
422 nvidia,cpu-pwr-off-time = <5000>;
423 nvidia,core-pwr-good-time = <3845 3845>;
424 nvidia,core-pwr-off-time = <3875>;
425 nvidia,sys-clock-req-active-high;
426 };
427
428 pcie-controller@80003000 {
429 pex-clk-supply = <&pci_clk_reg>;
430 vdd-supply = <&pci_vdd_reg>;
431 status = "okay";
432
433 pci@1,0 {
434 status = "okay";
435 };
436
437 pci@2,0 {
438 status = "okay";
439 };
440 };
441
442 usb@c5000000 {
443 status = "okay";
444 };
445
446 usb-phy@c5000000 {
447 status = "okay";
448 };
449
450 usb@c5004000 {
451 status = "okay";
452 nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
453 GPIO_ACTIVE_LOW>;
454 };
455
456 usb-phy@c5004000 {
457 status = "okay";
458 nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
459 GPIO_ACTIVE_LOW>;
460 };
461
462 usb@c5008000 {
463 status = "okay";
464 };
465
466 usb-phy@c5008000 {
467 status = "okay";
468 };
469
470 sdhci@c8000200 {
471 status = "okay";
472 cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
473 wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
474 power-gpios = <&gpio TEGRA_GPIO(T, 3) GPIO_ACTIVE_HIGH>;
475 bus-width = <4>;
476 };
477
478 sdhci@c8000600 {
479 status = "okay";
480 cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;
481 wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
482 power-gpios = <&gpio TEGRA_GPIO(I, 6) GPIO_ACTIVE_HIGH>;
483 bus-width = <8>;
484 };
485
486 clocks {
487 compatible = "simple-bus";
488 #address-cells = <1>;
489 #size-cells = <0>;
490
491 clk32k_in: clock@0 {
492 compatible = "fixed-clock";
493 reg=<0>;
494 #clock-cells = <0>;
495 clock-frequency = <32768>;
496 };
497 };
498
499 gpio-keys {
500 compatible = "gpio-keys";
501
502 power {
503 label = "Power";
504 gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
505 linux,code = <116>; /* KEY_POWER */
506 gpio-key,wakeup;
507 };
508 };
509
510 kbc@7000e200 { 418 kbc@7000e200 {
511 status = "okay"; 419 status = "okay";
512 nvidia,debounce-delay-ms = <2>; 420 nvidia,debounce-delay-ms = <2>;
@@ -624,6 +532,98 @@
624 0x1F0400D6>; /* KEY_QUESTION */ 532 0x1F0400D6>; /* KEY_QUESTION */
625 }; 533 };
626 534
535 pmc@7000e400 {
536 nvidia,invert-interrupt;
537 nvidia,suspend-mode = <1>;
538 nvidia,cpu-pwr-good-time = <5000>;
539 nvidia,cpu-pwr-off-time = <5000>;
540 nvidia,core-pwr-good-time = <3845 3845>;
541 nvidia,core-pwr-off-time = <3875>;
542 nvidia,sys-clock-req-active-high;
543 };
544
545 pcie-controller@80003000 {
546 pex-clk-supply = <&pci_clk_reg>;
547 vdd-supply = <&pci_vdd_reg>;
548 status = "okay";
549
550 pci@1,0 {
551 status = "okay";
552 };
553
554 pci@2,0 {
555 status = "okay";
556 };
557 };
558
559 usb@c5000000 {
560 status = "okay";
561 };
562
563 usb-phy@c5000000 {
564 status = "okay";
565 };
566
567 usb@c5004000 {
568 status = "okay";
569 nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
570 GPIO_ACTIVE_LOW>;
571 };
572
573 usb-phy@c5004000 {
574 status = "okay";
575 nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
576 GPIO_ACTIVE_LOW>;
577 };
578
579 usb@c5008000 {
580 status = "okay";
581 };
582
583 usb-phy@c5008000 {
584 status = "okay";
585 };
586
587 sdhci@c8000200 {
588 status = "okay";
589 cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
590 wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
591 power-gpios = <&gpio TEGRA_GPIO(T, 3) GPIO_ACTIVE_HIGH>;
592 bus-width = <4>;
593 };
594
595 sdhci@c8000600 {
596 status = "okay";
597 cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;
598 wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
599 power-gpios = <&gpio TEGRA_GPIO(I, 6) GPIO_ACTIVE_HIGH>;
600 bus-width = <8>;
601 };
602
603 clocks {
604 compatible = "simple-bus";
605 #address-cells = <1>;
606 #size-cells = <0>;
607
608 clk32k_in: clock@0 {
609 compatible = "fixed-clock";
610 reg=<0>;
611 #clock-cells = <0>;
612 clock-frequency = <32768>;
613 };
614 };
615
616 gpio-keys {
617 compatible = "gpio-keys";
618
619 power {
620 label = "Power";
621 gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
622 linux,code = <116>; /* KEY_POWER */
623 gpio-key,wakeup;
624 };
625 };
626
627 regulators { 627 regulators {
628 compatible = "simple-bus"; 628 compatible = "simple-bus";
629 #address-cells = <1>; 629 #address-cells = <1>;
diff --git a/arch/arm/boot/dts/tegra20-iris-512.dts b/arch/arm/boot/dts/tegra20-iris-512.dts
index 770fc66e5fce..274d252c90f8 100644
--- a/arch/arm/boot/dts/tegra20-iris-512.dts
+++ b/arch/arm/boot/dts/tegra20-iris-512.dts
@@ -36,31 +36,31 @@
36 }; 36 };
37 }; 37 };
38 38
39 usb@c5000000 { 39 serial@70006000 {
40 status = "okay"; 40 status = "okay";
41 }; 41 };
42 42
43 usb-phy@c5000000 { 43 serial@70006300 {
44 status = "okay"; 44 status = "okay";
45 }; 45 };
46 46
47 usb@c5008000 { 47 i2c_ddc: i2c@7000c400 {
48 status = "okay"; 48 status = "okay";
49 }; 49 };
50 50
51 usb-phy@c5008000 { 51 usb@c5000000 {
52 status = "okay"; 52 status = "okay";
53 }; 53 };
54 54
55 serial@70006000 { 55 usb-phy@c5000000 {
56 status = "okay"; 56 status = "okay";
57 }; 57 };
58 58
59 serial@70006300 { 59 usb@c5008000 {
60 status = "okay"; 60 status = "okay";
61 }; 61 };
62 62
63 i2c_ddc: i2c@7000c400 { 63 usb-phy@c5008000 {
64 status = "okay"; 64 status = "okay";
65 }; 65 };
66 66
diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
index 01442fc257de..07ff55a0d631 100644
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -386,6 +386,13 @@
386 status = "okay"; 386 status = "okay";
387 clock-frequency = <400000>; 387 clock-frequency = <400000>;
388 388
389 magnetometer@c {
390 compatible = "ak,ak8975";
391 reg = <0xc>;
392 interrupt-parent = <&gpio>;
393 interrupts = <TEGRA_GPIO(N, 5) IRQ_TYPE_LEVEL_HIGH>;
394 };
395
389 pmic: tps6586x@34 { 396 pmic: tps6586x@34 {
390 compatible = "ti,tps6586x"; 397 compatible = "ti,tps6586x";
391 reg = <0x34>; 398 reg = <0x34>;
@@ -507,146 +514,6 @@
507 compatible = "onnn,nct1008"; 514 compatible = "onnn,nct1008";
508 reg = <0x4c>; 515 reg = <0x4c>;
509 }; 516 };
510
511 magnetometer@c {
512 compatible = "ak,ak8975";
513 reg = <0xc>;
514 interrupt-parent = <&gpio>;
515 interrupts = <TEGRA_GPIO(N, 5) IRQ_TYPE_LEVEL_HIGH>;
516 };
517 };
518
519 pmc@7000e400 {
520 nvidia,invert-interrupt;
521 nvidia,suspend-mode = <1>;
522 nvidia,cpu-pwr-good-time = <5000>;
523 nvidia,cpu-pwr-off-time = <5000>;
524 nvidia,core-pwr-good-time = <3845 3845>;
525 nvidia,core-pwr-off-time = <3875>;
526 nvidia,sys-clock-req-active-high;
527 };
528
529 memory-controller@7000f400 {
530 emc-table@190000 {
531 reg = <190000>;
532 compatible = "nvidia,tegra20-emc-table";
533 clock-frequency = <190000>;
534 nvidia,emc-registers = <0x0000000c 0x00000026
535 0x00000009 0x00000003 0x00000004 0x00000004
536 0x00000002 0x0000000c 0x00000003 0x00000003
537 0x00000002 0x00000001 0x00000004 0x00000005
538 0x00000004 0x00000009 0x0000000d 0x0000059f
539 0x00000000 0x00000003 0x00000003 0x00000003
540 0x00000003 0x00000001 0x0000000b 0x000000c8
541 0x00000003 0x00000007 0x00000004 0x0000000f
542 0x00000002 0x00000000 0x00000000 0x00000002
543 0x00000000 0x00000000 0x00000083 0xa06204ae
544 0x007dc010 0x00000000 0x00000000 0x00000000
545 0x00000000 0x00000000 0x00000000 0x00000000>;
546 };
547
548 emc-table@380000 {
549 reg = <380000>;
550 compatible = "nvidia,tegra20-emc-table";
551 clock-frequency = <380000>;
552 nvidia,emc-registers = <0x00000017 0x0000004b
553 0x00000012 0x00000006 0x00000004 0x00000005
554 0x00000003 0x0000000c 0x00000006 0x00000006
555 0x00000003 0x00000001 0x00000004 0x00000005
556 0x00000004 0x00000009 0x0000000d 0x00000b5f
557 0x00000000 0x00000003 0x00000003 0x00000006
558 0x00000006 0x00000001 0x00000011 0x000000c8
559 0x00000003 0x0000000e 0x00000007 0x0000000f
560 0x00000002 0x00000000 0x00000000 0x00000002
561 0x00000000 0x00000000 0x00000083 0xe044048b
562 0x007d8010 0x00000000 0x00000000 0x00000000
563 0x00000000 0x00000000 0x00000000 0x00000000>;
564 };
565 };
566
567 usb@c5000000 {
568 status = "okay";
569 dr_mode = "otg";
570 };
571
572 usb-phy@c5000000 {
573 status = "okay";
574 vbus-supply = <&vbus_reg>;
575 dr_mode = "otg";
576 };
577
578 usb@c5004000 {
579 status = "okay";
580 nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
581 GPIO_ACTIVE_LOW>;
582 };
583
584 usb-phy@c5004000 {
585 status = "okay";
586 nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
587 GPIO_ACTIVE_LOW>;
588 };
589
590 usb@c5008000 {
591 status = "okay";
592 };
593
594 usb-phy@c5008000 {
595 status = "okay";
596 };
597
598 sdhci@c8000000 {
599 status = "okay";
600 power-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
601 bus-width = <4>;
602 keep-power-in-suspend;
603 };
604
605 sdhci@c8000400 {
606 status = "okay";
607 cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
608 wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
609 power-gpios = <&gpio TEGRA_GPIO(I, 6) GPIO_ACTIVE_HIGH>;
610 bus-width = <4>;
611 };
612
613 sdhci@c8000600 {
614 status = "okay";
615 bus-width = <8>;
616 non-removable;
617 };
618
619 clocks {
620 compatible = "simple-bus";
621 #address-cells = <1>;
622 #size-cells = <0>;
623
624 clk32k_in: clock@0 {
625 compatible = "fixed-clock";
626 reg=<0>;
627 #clock-cells = <0>;
628 clock-frequency = <32768>;
629 };
630 };
631
632 gpio-keys {
633 compatible = "gpio-keys";
634
635 power {
636 label = "Power";
637 gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
638 linux,code = <116>; /* KEY_POWER */
639 gpio-key,wakeup;
640 };
641
642 lid {
643 label = "Lid";
644 gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_HIGH>;
645 linux,input-type = <5>; /* EV_SW */
646 linux,code = <0>; /* SW_LID */
647 debounce-interval = <1>;
648 gpio-key,wakeup;
649 };
650 }; 517 };
651 518
652 kbc@7000e200 { 519 kbc@7000e200 {
@@ -788,6 +655,140 @@
788 655
789 0x1F04008A>; /* KEY_HELP */ 656 0x1F04008A>; /* KEY_HELP */
790 }; 657 };
658
659 pmc@7000e400 {
660 nvidia,invert-interrupt;
661 nvidia,suspend-mode = <1>;
662 nvidia,cpu-pwr-good-time = <5000>;
663 nvidia,cpu-pwr-off-time = <5000>;
664 nvidia,core-pwr-good-time = <3845 3845>;
665 nvidia,core-pwr-off-time = <3875>;
666 nvidia,sys-clock-req-active-high;
667 };
668
669 memory-controller@7000f400 {
670 emc-table@190000 {
671 reg = <190000>;
672 compatible = "nvidia,tegra20-emc-table";
673 clock-frequency = <190000>;
674 nvidia,emc-registers = <0x0000000c 0x00000026
675 0x00000009 0x00000003 0x00000004 0x00000004
676 0x00000002 0x0000000c 0x00000003 0x00000003
677 0x00000002 0x00000001 0x00000004 0x00000005
678 0x00000004 0x00000009 0x0000000d 0x0000059f
679 0x00000000 0x00000003 0x00000003 0x00000003
680 0x00000003 0x00000001 0x0000000b 0x000000c8
681 0x00000003 0x00000007 0x00000004 0x0000000f
682 0x00000002 0x00000000 0x00000000 0x00000002
683 0x00000000 0x00000000 0x00000083 0xa06204ae
684 0x007dc010 0x00000000 0x00000000 0x00000000
685 0x00000000 0x00000000 0x00000000 0x00000000>;
686 };
687
688 emc-table@380000 {
689 reg = <380000>;
690 compatible = "nvidia,tegra20-emc-table";
691 clock-frequency = <380000>;
692 nvidia,emc-registers = <0x00000017 0x0000004b
693 0x00000012 0x00000006 0x00000004 0x00000005
694 0x00000003 0x0000000c 0x00000006 0x00000006
695 0x00000003 0x00000001 0x00000004 0x00000005
696 0x00000004 0x00000009 0x0000000d 0x00000b5f
697 0x00000000 0x00000003 0x00000003 0x00000006
698 0x00000006 0x00000001 0x00000011 0x000000c8
699 0x00000003 0x0000000e 0x00000007 0x0000000f
700 0x00000002 0x00000000 0x00000000 0x00000002
701 0x00000000 0x00000000 0x00000083 0xe044048b
702 0x007d8010 0x00000000 0x00000000 0x00000000
703 0x00000000 0x00000000 0x00000000 0x00000000>;
704 };
705 };
706
707 usb@c5000000 {
708 status = "okay";
709 dr_mode = "otg";
710 };
711
712 usb-phy@c5000000 {
713 status = "okay";
714 vbus-supply = <&vbus_reg>;
715 dr_mode = "otg";
716 };
717
718 usb@c5004000 {
719 status = "okay";
720 nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
721 GPIO_ACTIVE_LOW>;
722 };
723
724 usb-phy@c5004000 {
725 status = "okay";
726 nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
727 GPIO_ACTIVE_LOW>;
728 };
729
730 usb@c5008000 {
731 status = "okay";
732 };
733
734 usb-phy@c5008000 {
735 status = "okay";
736 };
737
738 sdhci@c8000000 {
739 status = "okay";
740 power-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
741 bus-width = <4>;
742 keep-power-in-suspend;
743 };
744
745 sdhci@c8000400 {
746 status = "okay";
747 cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
748 wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
749 power-gpios = <&gpio TEGRA_GPIO(I, 6) GPIO_ACTIVE_HIGH>;
750 bus-width = <4>;
751 };
752
753 sdhci@c8000600 {
754 status = "okay";
755 bus-width = <8>;
756 non-removable;
757 };
758
759 clocks {
760 compatible = "simple-bus";
761 #address-cells = <1>;
762 #size-cells = <0>;
763
764 clk32k_in: clock@0 {
765 compatible = "fixed-clock";
766 reg=<0>;
767 #clock-cells = <0>;
768 clock-frequency = <32768>;
769 };
770 };
771
772 gpio-keys {
773 compatible = "gpio-keys";
774
775 power {
776 label = "Power";
777 gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
778 linux,code = <116>; /* KEY_POWER */
779 gpio-key,wakeup;
780 };
781
782 lid {
783 label = "Lid";
784 gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_HIGH>;
785 linux,input-type = <5>; /* EV_SW */
786 linux,code = <0>; /* SW_LID */
787 debounce-interval = <1>;
788 gpio-key,wakeup;
789 };
790 };
791
791 regulators { 792 regulators {
792 compatible = "simple-bus"; 793 compatible = "simple-bus";
793 #address-cells = <1>; 794 #address-cells = <1>;
diff --git a/arch/arm/boot/dts/tegra20-whistler.dts b/arch/arm/boot/dts/tegra20-whistler.dts
index b047621b95d2..82037fe814ce 100644
--- a/arch/arm/boot/dts/tegra20-whistler.dts
+++ b/arch/arm/boot/dts/tegra20-whistler.dts
@@ -495,6 +495,19 @@
495 }; 495 };
496 }; 496 };
497 497
498 kbc@7000e200 {
499 status = "okay";
500 nvidia,debounce-delay-ms = <20>;
501 nvidia,repeat-delay-ms = <160>;
502 nvidia,kbc-row-pins = <0 1 2>;
503 nvidia,kbc-col-pins = <16 17>;
504 nvidia,wakeup-source;
505 linux,keymap = <0x00000074 /* KEY_POWER */
506 0x01000066 /* KEY_HOME */
507 0x0101009E /* KEY_BACK */
508 0x0201008B>; /* KEY_MENU */
509 };
510
498 pmc@7000e400 { 511 pmc@7000e400 {
499 nvidia,invert-interrupt; 512 nvidia,invert-interrupt;
500 nvidia,suspend-mode = <1>; 513 nvidia,suspend-mode = <1>;
@@ -551,19 +564,6 @@
551 }; 564 };
552 }; 565 };
553 566
554 kbc@7000e200 {
555 status = "okay";
556 nvidia,debounce-delay-ms = <20>;
557 nvidia,repeat-delay-ms = <160>;
558 nvidia,kbc-row-pins = <0 1 2>;
559 nvidia,kbc-col-pins = <16 17>;
560 nvidia,wakeup-source;
561 linux,keymap = <0x00000074 /* KEY_POWER */
562 0x01000066 /* KEY_HOME */
563 0x0101009E /* KEY_BACK */
564 0x0201008B>; /* KEY_MENU */
565 };
566
567 regulators { 567 regulators {
568 compatible = "simple-bus"; 568 compatible = "simple-bus";
569 #address-cells = <1>; 569 #address-cells = <1>;
diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts
index bc28e27e4fe7..3ad193c37436 100644
--- a/arch/arm/boot/dts/tegra30-beaver.dts
+++ b/arch/arm/boot/dts/tegra30-beaver.dts
@@ -168,19 +168,6 @@
168 <&gpio TEGRA_GPIO(X, 2) GPIO_ACTIVE_HIGH>; 168 <&gpio TEGRA_GPIO(X, 2) GPIO_ACTIVE_HIGH>;
169 }; 169 };
170 170
171 tps62361@60 {
172 compatible = "ti,tps62361";
173 reg = <0x60>;
174
175 regulator-name = "tps62361-vout";
176 regulator-min-microvolt = <500000>;
177 regulator-max-microvolt = <1500000>;
178 regulator-boot-on;
179 regulator-always-on;
180 ti,vsel0-state-high;
181 ti,vsel1-state-high;
182 };
183
184 pmic: tps65911@2d { 171 pmic: tps65911@2d {
185 compatible = "ti,tps65911"; 172 compatible = "ti,tps65911";
186 reg = <0x2d>; 173 reg = <0x2d>;
@@ -284,6 +271,19 @@
284 }; 271 };
285 }; 272 };
286 }; 273 };
274
275 tps62361@60 {
276 compatible = "ti,tps62361";
277 reg = <0x60>;
278
279 regulator-name = "tps62361-vout";
280 regulator-min-microvolt = <500000>;
281 regulator-max-microvolt = <1500000>;
282 regulator-boot-on;
283 regulator-always-on;
284 ti,vsel0-state-high;
285 ti,vsel1-state-high;
286 };
287 }; 287 };
288 288
289 spi@7000da00 { 289 spi@7000da00 {
@@ -296,12 +296,6 @@
296 }; 296 };
297 }; 297 };
298 298
299 ahub@70080000 {
300 i2s@70080400 {
301 status = "okay";
302 };
303 };
304
305 pmc@7000e400 { 299 pmc@7000e400 {
306 status = "okay"; 300 status = "okay";
307 nvidia,invert-interrupt; 301 nvidia,invert-interrupt;
@@ -314,6 +308,12 @@
314 nvidia,sys-clock-req-active-high; 308 nvidia,sys-clock-req-active-high;
315 }; 309 };
316 310
311 ahub@70080000 {
312 i2s@70080400 {
313 status = "okay";
314 };
315 };
316
317 sdhci@78000000 { 317 sdhci@78000000 {
318 status = "okay"; 318 status = "okay";
319 cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>; 319 cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
@@ -350,6 +350,19 @@
350 }; 350 };
351 }; 351 };
352 352
353 gpio-leds {
354 compatible = "gpio-leds";
355
356 gpled1 {
357 label = "LED1"; /* CR5A1 (blue) */
358 gpios = <&gpio TEGRA_GPIO(L, 1) GPIO_ACTIVE_HIGH>;
359 };
360 gpled2 {
361 label = "LED2"; /* CR4A2 (green) */
362 gpios = <&gpio TEGRA_GPIO(L, 0) GPIO_ACTIVE_HIGH>;
363 };
364 };
365
353 regulators { 366 regulators {
354 compatible = "simple-bus"; 367 compatible = "simple-bus";
355 #address-cells = <1>; 368 #address-cells = <1>;
@@ -453,19 +466,6 @@
453 }; 466 };
454 }; 467 };
455 468
456 gpio-leds {
457 compatible = "gpio-leds";
458
459 gpled1 {
460 label = "LED1"; /* CR5A1 (blue) */
461 gpios = <&gpio TEGRA_GPIO(L, 1) GPIO_ACTIVE_HIGH>;
462 };
463 gpled2 {
464 label = "LED2"; /* CR4A2 (green) */
465 gpios = <&gpio TEGRA_GPIO(L, 0) GPIO_ACTIVE_HIGH>;
466 };
467 };
468
469 sound { 469 sound {
470 compatible = "nvidia,tegra-audio-rt5640-beaver", 470 compatible = "nvidia,tegra-audio-rt5640-beaver",
471 "nvidia,tegra-audio-rt5640"; 471 "nvidia,tegra-audio-rt5640";
diff --git a/arch/arm/boot/dts/tegra30-cardhu-a02.dts b/arch/arm/boot/dts/tegra30-cardhu-a02.dts
index 1082c5ed90d1..c9bfedcca6ed 100644
--- a/arch/arm/boot/dts/tegra30-cardhu-a02.dts
+++ b/arch/arm/boot/dts/tegra30-cardhu-a02.dts
@@ -8,6 +8,13 @@
8 model = "NVIDIA Tegra30 Cardhu A02 evaluation board"; 8 model = "NVIDIA Tegra30 Cardhu A02 evaluation board";
9 compatible = "nvidia,cardhu-a02", "nvidia,cardhu", "nvidia,tegra30"; 9 compatible = "nvidia,cardhu-a02", "nvidia,cardhu", "nvidia,tegra30";
10 10
11 sdhci@78000400 {
12 status = "okay";
13 power-gpios = <&gpio TEGRA_GPIO(D, 4) GPIO_ACTIVE_HIGH>;
14 bus-width = <4>;
15 keep-power-in-suspend;
16 };
17
11 regulators { 18 regulators {
12 compatible = "simple-bus"; 19 compatible = "simple-bus";
13 #address-cells = <1>; 20 #address-cells = <1>;
@@ -83,12 +90,5 @@
83 gpio = <&gpio TEGRA_GPIO(K, 3) GPIO_ACTIVE_HIGH>; 90 gpio = <&gpio TEGRA_GPIO(K, 3) GPIO_ACTIVE_HIGH>;
84 }; 91 };
85 }; 92 };
86
87 sdhci@78000400 {
88 status = "okay";
89 power-gpios = <&gpio TEGRA_GPIO(D, 4) GPIO_ACTIVE_HIGH>;
90 bus-width = <4>;
91 keep-power-in-suspend;
92 };
93}; 93};
94 94
diff --git a/arch/arm/boot/dts/tegra30-cardhu-a04.dts b/arch/arm/boot/dts/tegra30-cardhu-a04.dts
index bf012bddaafb..fadf55e46b2b 100644
--- a/arch/arm/boot/dts/tegra30-cardhu-a04.dts
+++ b/arch/arm/boot/dts/tegra30-cardhu-a04.dts
@@ -8,6 +8,13 @@
8 model = "NVIDIA Tegra30 Cardhu A04 (A05, A06, A07) evaluation board"; 8 model = "NVIDIA Tegra30 Cardhu A04 (A05, A06, A07) evaluation board";
9 compatible = "nvidia,cardhu-a04", "nvidia,cardhu", "nvidia,tegra30"; 9 compatible = "nvidia,cardhu-a04", "nvidia,cardhu", "nvidia,tegra30";
10 10
11 sdhci@78000400 {
12 status = "okay";
13 power-gpios = <&gpio TEGRA_GPIO(D, 3) GPIO_ACTIVE_HIGH>;
14 bus-width = <4>;
15 keep-power-in-suspend;
16 };
17
11 regulators { 18 regulators {
12 compatible = "simple-bus"; 19 compatible = "simple-bus";
13 #address-cells = <1>; 20 #address-cells = <1>;
@@ -95,11 +102,4 @@
95 gpio = <&gpio TEGRA_GPIO(DD, 0) GPIO_ACTIVE_HIGH>; 102 gpio = <&gpio TEGRA_GPIO(DD, 0) GPIO_ACTIVE_HIGH>;
96 }; 103 };
97 }; 104 };
98
99 sdhci@78000400 {
100 status = "okay";
101 power-gpios = <&gpio TEGRA_GPIO(D, 3) GPIO_ACTIVE_HIGH>;
102 bus-width = <4>;
103 keep-power-in-suspend;
104 };
105}; 105};
diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index b159a41c7338..748b4ba945ee 100644
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -326,12 +326,6 @@
326 }; 326 };
327 }; 327 };
328 328
329 ahub@70080000 {
330 i2s@70080400 {
331 status = "okay";
332 };
333 };
334
335 pmc@7000e400 { 329 pmc@7000e400 {
336 status = "okay"; 330 status = "okay";
337 nvidia,invert-interrupt; 331 nvidia,invert-interrupt;
@@ -344,6 +338,12 @@
344 nvidia,sys-clock-req-active-high; 338 nvidia,sys-clock-req-active-high;
345 }; 339 };
346 340
341 ahub@70080000 {
342 i2s@70080400 {
343 status = "okay";
344 };
345 };
346
347 sdhci@78000000 { 347 sdhci@78000000 {
348 status = "okay"; 348 status = "okay";
349 cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>; 349 cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-24 18:54:41 -0500