aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2013-02-12 19:25:15 -0500
committerStephen Warren <swarren@nvidia.com>2013-05-28 18:13:49 -0400
commit3325f1bcd03a0472aa1839732fb46f3c1f010205 (patch)
treed3dfad9b8eea0238cc9735a8e617cc5f0fab2c99 /arch/arm/boot/dts
parent9798e47ff232c48b3c25b9a6b9395b505e389475 (diff)
ARM: tegra: convert device tree files to use GPIO defines
Use TEGRA_GPIO() macro to name all GPIOs referenced by GPIO properties, and some interrupts properties. Use standard GPIO flag defines too. Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r--arch/arm/boot/dts/tegra114-dalmore.dts12
-rw-r--r--arch/arm/boot/dts/tegra114.dtsi2
-rw-r--r--arch/arm/boot/dts/tegra20-colibri-512.dtsi19
-rw-r--r--arch/arm/boot/dts/tegra20-harmony.dts46
-rw-r--r--arch/arm/boot/dts/tegra20-iris-512.dts2
-rw-r--r--arch/arm/boot/dts/tegra20-medcom-wide.dts6
-rw-r--r--arch/arm/boot/dts/tegra20-paz00.dts24
-rw-r--r--arch/arm/boot/dts/tegra20-plutux.dts6
-rw-r--r--arch/arm/boot/dts/tegra20-seaboard.dts39
-rw-r--r--arch/arm/boot/dts/tegra20-tamonten.dtsi7
-rw-r--r--arch/arm/boot/dts/tegra20-tec.dts7
-rw-r--r--arch/arm/boot/dts/tegra20-trimslice.dts19
-rw-r--r--arch/arm/boot/dts/tegra20-ventana.dts41
-rw-r--r--arch/arm/boot/dts/tegra20-whistler.dts11
-rw-r--r--arch/arm/boot/dts/tegra20.dtsi2
-rw-r--r--arch/arm/boot/dts/tegra30-beaver.dts24
-rw-r--r--arch/arm/boot/dts/tegra30-cardhu-a02.dts14
-rw-r--r--arch/arm/boot/dts/tegra30-cardhu-a04.dts16
-rw-r--r--arch/arm/boot/dts/tegra30-cardhu.dtsi39
-rw-r--r--arch/arm/boot/dts/tegra30.dtsi2
20 files changed, 187 insertions, 151 deletions
diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts
index acc5257041d0..2571525769ce 100644
--- a/arch/arm/boot/dts/tegra114-dalmore.dts
+++ b/arch/arm/boot/dts/tegra114-dalmore.dts
@@ -838,7 +838,7 @@
838 }; 838 };
839 839
840 sdhci@78000400 { 840 sdhci@78000400 {
841 cd-gpios = <&gpio 170 1>; /* gpio PV2 */ 841 cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
842 bus-width = <4>; 842 bus-width = <4>;
843 status = "okay"; 843 status = "okay";
844 }; 844 };
@@ -883,7 +883,7 @@
883 regulator-min-microvolt = <1800000>; 883 regulator-min-microvolt = <1800000>;
884 regulator-max-microvolt = <1800000>; 884 regulator-max-microvolt = <1800000>;
885 enable-active-high; 885 enable-active-high;
886 gpio = <&gpio 61 0>; /* GPIO PH5 */ 886 gpio = <&gpio TEGRA_GPIO(H, 5) GPIO_ACTIVE_HIGH>;
887 }; 887 };
888 888
889 lcd_bl_en_reg: regulator@2 { 889 lcd_bl_en_reg: regulator@2 {
@@ -893,7 +893,7 @@
893 regulator-min-microvolt = <5000000>; 893 regulator-min-microvolt = <5000000>;
894 regulator-max-microvolt = <5000000>; 894 regulator-max-microvolt = <5000000>;
895 enable-active-high; 895 enable-active-high;
896 gpio = <&gpio 58 0>; /* GPIO PH2 */ 896 gpio = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_HIGH>;
897 }; 897 };
898 898
899 usb1_vbus_reg: regulator@3 { 899 usb1_vbus_reg: regulator@3 {
@@ -903,7 +903,7 @@
903 regulator-min-microvolt = <5000000>; 903 regulator-min-microvolt = <5000000>;
904 regulator-max-microvolt = <5000000>; 904 regulator-max-microvolt = <5000000>;
905 enable-active-high; 905 enable-active-high;
906 gpio = <&gpio 108 0>; /* GPIO PN4 */ 906 gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
907 gpio-open-drain; 907 gpio-open-drain;
908 vin-supply = <&tps65090_dcdc1_reg>; 908 vin-supply = <&tps65090_dcdc1_reg>;
909 }; 909 };
@@ -915,7 +915,7 @@
915 regulator-min-microvolt = <5000000>; 915 regulator-min-microvolt = <5000000>;
916 regulator-max-microvolt = <5000000>; 916 regulator-max-microvolt = <5000000>;
917 enable-active-high; 917 enable-active-high;
918 gpio = <&gpio 86 0>; /* GPIO PK6 */ 918 gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
919 gpio-open-drain; 919 gpio-open-drain;
920 vin-supply = <&tps65090_dcdc1_reg>; 920 vin-supply = <&tps65090_dcdc1_reg>;
921 }; 921 };
@@ -927,7 +927,7 @@
927 regulator-min-microvolt = <5000000>; 927 regulator-min-microvolt = <5000000>;
928 regulator-max-microvolt = <5000000>; 928 regulator-max-microvolt = <5000000>;
929 enable-active-high; 929 enable-active-high;
930 gpio = <&gpio 81 0>; /* GPIO PK1 */ 930 gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;
931 vin-supply = <&tps65090_dcdc1_reg>; 931 vin-supply = <&tps65090_dcdc1_reg>;
932 }; 932 };
933 }; 933 };
diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi
index aeeb53b12d29..6cd6d413191a 100644
--- a/arch/arm/boot/dts/tegra114.dtsi
+++ b/arch/arm/boot/dts/tegra114.dtsi
@@ -1,3 +1,5 @@
1#include <dt-bindings/gpio/tegra-gpio.h>
2
1#include "skeleton.dtsi" 3#include "skeleton.dtsi"
2 4
3/ { 5/ {
diff --git a/arch/arm/boot/dts/tegra20-colibri-512.dtsi b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
index efd705157f6d..a80be142c96b 100644
--- a/arch/arm/boot/dts/tegra20-colibri-512.dtsi
+++ b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
@@ -14,7 +14,8 @@
14 pll-supply = <&hdmi_pll_reg>; 14 pll-supply = <&hdmi_pll_reg>;
15 15
16 nvidia,ddc-i2c-bus = <&i2c_ddc>; 16 nvidia,ddc-i2c-bus = <&i2c_ddc>;
17 nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */ 17 nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7)
18 GPIO_ACTIVE_HIGH>;
18 }; 19 };
19 }; 20 };
20 21
@@ -443,21 +444,25 @@
443 444
444 ac97: ac97 { 445 ac97: ac97 {
445 status = "okay"; 446 status = "okay";
446 nvidia,codec-reset-gpio = <&gpio 168 0>; /* gpio PV0 */ 447 nvidia,codec-reset-gpio = <&gpio TEGRA_GPIO(V, 0)
447 nvidia,codec-sync-gpio = <&gpio 120 0>; /* gpio PP0 */ 448 GPIO_ACTIVE_HIGH>;
449 nvidia,codec-sync-gpio = <&gpio TEGRA_GPIO(P, 0)
450 GPIO_ACTIVE_HIGH>;
448 }; 451 };
449 452
450 usb@c5004000 { 453 usb@c5004000 {
451 status = "okay"; 454 status = "okay";
452 nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */ 455 nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
456 GPIO_ACTIVE_LOW>;
453 }; 457 };
454 458
455 usb-phy@c5004000 { 459 usb-phy@c5004000 {
456 nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */ 460 nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
461 GPIO_ACTIVE_LOW>;
457 }; 462 };
458 463
459 sdhci@c8000600 { 464 sdhci@c8000600 {
460 cd-gpios = <&gpio 23 1>; /* gpio PC7 */ 465 cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>;
461 }; 466 };
462 467
463 clocks { 468 clocks {
@@ -514,7 +519,7 @@
514 enable-active-high; 519 enable-active-high;
515 regulator-boot-on; 520 regulator-boot-on;
516 regulator-always-on; 521 regulator-always-on;
517 gpio = <&gpio 217 0>; 522 gpio = <&gpio TEGRA_GPIO(BB, 1) GPIO_ACTIVE_HIGH>;
518 }; 523 };
519 }; 524 };
520}; 525};
diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index 0f788f9587cd..8fac82b454fd 100644
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -18,7 +18,8 @@
18 pll-supply = <&hdmi_pll_reg>; 18 pll-supply = <&hdmi_pll_reg>;
19 19
20 nvidia,ddc-i2c-bus = <&hdmi_ddc>; 20 nvidia,ddc-i2c-bus = <&hdmi_ddc>;
21 nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */ 21 nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7)
22 GPIO_ACTIVE_HIGH>;
22 }; 23 };
23 }; 24 };
24 25
@@ -262,7 +263,7 @@
262 compatible = "wlf,wm8903"; 263 compatible = "wlf,wm8903";
263 reg = <0x1a>; 264 reg = <0x1a>;
264 interrupt-parent = <&gpio>; 265 interrupt-parent = <&gpio>;
265 interrupts = <187 0x04>; 266 interrupts = <TEGRA_GPIO(X, 3) 0x04>;
266 267
267 gpio-controller; 268 gpio-controller;
268 #gpio-cells = <2>; 269 #gpio-cells = <2>;
@@ -434,12 +435,14 @@
434 435
435 usb@c5004000 { 436 usb@c5004000 {
436 status = "okay"; 437 status = "okay";
437 nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */ 438 nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
439 GPIO_ACTIVE_LOW>;
438 }; 440 };
439 441
440 usb-phy@c5004000 { 442 usb-phy@c5004000 {
441 status = "okay"; 443 status = "okay";
442 nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */ 444 nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
445 GPIO_ACTIVE_LOW>;
443 }; 446 };
444 447
445 usb@c5008000 { 448 usb@c5008000 {
@@ -452,17 +455,17 @@
452 455
453 sdhci@c8000200 { 456 sdhci@c8000200 {
454 status = "okay"; 457 status = "okay";
455 cd-gpios = <&gpio 69 1>; /* gpio PI5 */ 458 cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
456 wp-gpios = <&gpio 57 0>; /* gpio PH1 */ 459 wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
457 power-gpios = <&gpio 155 0>; /* gpio PT3 */ 460 power-gpios = <&gpio TEGRA_GPIO(T, 3) GPIO_ACTIVE_HIGH>;
458 bus-width = <4>; 461 bus-width = <4>;
459 }; 462 };
460 463
461 sdhci@c8000600 { 464 sdhci@c8000600 {
462 status = "okay"; 465 status = "okay";
463 cd-gpios = <&gpio 58 1>; /* gpio PH2 */ 466 cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;
464 wp-gpios = <&gpio 59 0>; /* gpio PH3 */ 467 wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
465 power-gpios = <&gpio 70 0>; /* gpio PI6 */ 468 power-gpios = <&gpio TEGRA_GPIO(I, 6) GPIO_ACTIVE_HIGH>;
466 bus-width = <8>; 469 bus-width = <8>;
467 }; 470 };
468 471
@@ -484,7 +487,7 @@
484 487
485 power { 488 power {
486 label = "Power"; 489 label = "Power";
487 gpios = <&gpio 170 1>; /* gpio PV2, active low */ 490 gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
488 linux,code = <116>; /* KEY_POWER */ 491 linux,code = <116>; /* KEY_POWER */
489 gpio-key,wakeup; 492 gpio-key,wakeup;
490 }; 493 };
@@ -627,7 +630,7 @@
627 regulator-name = "vdd_1v5"; 630 regulator-name = "vdd_1v5";
628 regulator-min-microvolt = <1500000>; 631 regulator-min-microvolt = <1500000>;
629 regulator-max-microvolt = <1500000>; 632 regulator-max-microvolt = <1500000>;
630 gpio = <&pmic 0 0>; 633 gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
631 }; 634 };
632 635
633 regulator@2 { 636 regulator@2 {
@@ -636,7 +639,7 @@
636 regulator-name = "vdd_1v2"; 639 regulator-name = "vdd_1v2";
637 regulator-min-microvolt = <1200000>; 640 regulator-min-microvolt = <1200000>;
638 regulator-max-microvolt = <1200000>; 641 regulator-max-microvolt = <1200000>;
639 gpio = <&pmic 1 0>; 642 gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
640 enable-active-high; 643 enable-active-high;
641 }; 644 };
642 645
@@ -646,7 +649,7 @@
646 regulator-name = "vdd_1v05"; 649 regulator-name = "vdd_1v05";
647 regulator-min-microvolt = <1050000>; 650 regulator-min-microvolt = <1050000>;
648 regulator-max-microvolt = <1050000>; 651 regulator-max-microvolt = <1050000>;
649 gpio = <&pmic 2 0>; 652 gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
650 enable-active-high; 653 enable-active-high;
651 /* Hack until board-harmony-pcie.c is removed */ 654 /* Hack until board-harmony-pcie.c is removed */
652 status = "disabled"; 655 status = "disabled";
@@ -658,7 +661,7 @@
658 regulator-name = "vdd_pnl"; 661 regulator-name = "vdd_pnl";
659 regulator-min-microvolt = <2800000>; 662 regulator-min-microvolt = <2800000>;
660 regulator-max-microvolt = <2800000>; 663 regulator-max-microvolt = <2800000>;
661 gpio = <&gpio 22 0>; /* gpio PC6 */ 664 gpio = <&gpio TEGRA_GPIO(C, 6) GPIO_ACTIVE_HIGH>;
662 enable-active-high; 665 enable-active-high;
663 }; 666 };
664 667
@@ -668,7 +671,7 @@
668 regulator-name = "vdd_bl"; 671 regulator-name = "vdd_bl";
669 regulator-min-microvolt = <2800000>; 672 regulator-min-microvolt = <2800000>;
670 regulator-max-microvolt = <2800000>; 673 regulator-max-microvolt = <2800000>;
671 gpio = <&gpio 176 0>; /* gpio PW0 */ 674 gpio = <&gpio TEGRA_GPIO(W, 0) GPIO_ACTIVE_HIGH>;
672 enable-active-high; 675 enable-active-high;
673 }; 676 };
674 }; 677 };
@@ -691,10 +694,13 @@
691 nvidia,i2s-controller = <&tegra_i2s1>; 694 nvidia,i2s-controller = <&tegra_i2s1>;
692 nvidia,audio-codec = <&wm8903>; 695 nvidia,audio-codec = <&wm8903>;
693 696
694 nvidia,spkr-en-gpios = <&wm8903 2 0>; 697 nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
695 nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ 698 nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2)
696 nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */ 699 GPIO_ACTIVE_HIGH>;
697 nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */ 700 nvidia,int-mic-en-gpios = <&gpio TEGRA_GPIO(X, 0)
701 GPIO_ACTIVE_HIGH>;
702 nvidia,ext-mic-en-gpios = <&gpio TEGRA_GPIO(X, 1)
703 GPIO_ACTIVE_HIGH>;
698 704
699 clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>; 705 clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
700 clock-names = "pll_a", "pll_a_out0", "mclk"; 706 clock-names = "pll_a", "pll_a_out0", "mclk";
diff --git a/arch/arm/boot/dts/tegra20-iris-512.dts b/arch/arm/boot/dts/tegra20-iris-512.dts
index 9de10a2e78b8..f2222bd74eab 100644
--- a/arch/arm/boot/dts/tegra20-iris-512.dts
+++ b/arch/arm/boot/dts/tegra20-iris-512.dts
@@ -80,7 +80,7 @@
80 regulator-max-microvolt = <5000000>; 80 regulator-max-microvolt = <5000000>;
81 regulator-boot-on; 81 regulator-boot-on;
82 regulator-always-on; 82 regulator-always-on;
83 gpio = <&gpio 178 0>; 83 gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>;
84 }; 84 };
85 85
86 vcc_sd_reg: regulator@1 { 86 vcc_sd_reg: regulator@1 {
diff --git a/arch/arm/boot/dts/tegra20-medcom-wide.dts b/arch/arm/boot/dts/tegra20-medcom-wide.dts
index d7e32fa5d905..3adfbfe634f5 100644
--- a/arch/arm/boot/dts/tegra20-medcom-wide.dts
+++ b/arch/arm/boot/dts/tegra20-medcom-wide.dts
@@ -15,7 +15,7 @@
15 compatible = "wlf,wm8903"; 15 compatible = "wlf,wm8903";
16 reg = <0x1a>; 16 reg = <0x1a>;
17 interrupt-parent = <&gpio>; 17 interrupt-parent = <&gpio>;
18 interrupts = <187 0x04>; 18 interrupts = <TEGRA_GPIO(X, 3) 0x04>;
19 19
20 gpio-controller; 20 gpio-controller;
21 #gpio-cells = <2>; 21 #gpio-cells = <2>;
@@ -56,8 +56,8 @@
56 nvidia,i2s-controller = <&tegra_i2s1>; 56 nvidia,i2s-controller = <&tegra_i2s1>;
57 nvidia,audio-codec = <&wm8903>; 57 nvidia,audio-codec = <&wm8903>;
58 58
59 nvidia,spkr-en-gpios = <&wm8903 2 0>; 59 nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
60 nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ 60 nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>;
61 61
62 clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>; 62 clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
63 clock-names = "pll_a", "pll_a_out0", "mclk"; 63 clock-names = "pll_a", "pll_a_out0", "mclk";
diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts
index cbbd85a60bb9..0f267d861e75 100644
--- a/arch/arm/boot/dts/tegra20-paz00.dts
+++ b/arch/arm/boot/dts/tegra20-paz00.dts
@@ -18,7 +18,8 @@
18 pll-supply = <&hdmi_pll_reg>; 18 pll-supply = <&hdmi_pll_reg>;
19 19
20 nvidia,ddc-i2c-bus = <&hdmi_ddc>; 20 nvidia,ddc-i2c-bus = <&hdmi_ddc>;
21 nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */ 21 nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7)
22 GPIO_ACTIVE_HIGH>;
22 }; 23 };
23 }; 24 };
24 25
@@ -274,7 +275,7 @@
274 #address-cells = <1>; 275 #address-cells = <1>;
275 #size-cells = <0>; 276 #size-cells = <0>;
276 clock-frequency = <80000>; 277 clock-frequency = <80000>;
277 request-gpios = <&gpio 170 0>; /* gpio PV2 */ 278 request-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
278 slave-addr = <138>; 279 slave-addr = <138>;
279 clocks = <&tegra_car 67>, <&tegra_car 124>; 280 clocks = <&tegra_car 67>, <&tegra_car 124>;
280 clock-names = "div-clk", "fast-clk"; 281 clock-names = "div-clk", "fast-clk";
@@ -433,12 +434,14 @@
433 434
434 usb@c5004000 { 435 usb@c5004000 {
435 status = "okay"; 436 status = "okay";
436 nvidia,phy-reset-gpio = <&gpio 168 1>; /* gpio PV0, active low */ 437 nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 0)
438 GPIO_ACTIVE_LOW>;
437 }; 439 };
438 440
439 usb-phy@c5004000 { 441 usb-phy@c5004000 {
440 status = "okay"; 442 status = "okay";
441 nvidia,phy-reset-gpio = <&gpio 168 1>; /* gpio PV0, active low */ 443 nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 0)
444 GPIO_ACTIVE_LOW>;
442 }; 445 };
443 446
444 usb@c5008000 { 447 usb@c5008000 {
@@ -451,9 +454,9 @@
451 454
452 sdhci@c8000000 { 455 sdhci@c8000000 {
453 status = "okay"; 456 status = "okay";
454 cd-gpios = <&gpio 173 1>; /* gpio PV5 */ 457 cd-gpios = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_LOW>;
455 wp-gpios = <&gpio 57 0>; /* gpio PH1 */ 458 wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
456 power-gpios = <&gpio 169 0>; /* gpio PV1 */ 459 power-gpios = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_HIGH>;
457 bus-width = <4>; 460 bus-width = <4>;
458 }; 461 };
459 462
@@ -481,7 +484,7 @@
481 484
482 power { 485 power {
483 label = "Power"; 486 label = "Power";
484 gpios = <&gpio 79 1>; /* gpio PJ7, active low */ 487 gpios = <&gpio TEGRA_GPIO(J, 7) GPIO_ACTIVE_LOW>;
485 linux,code = <116>; /* KEY_POWER */ 488 linux,code = <116>; /* KEY_POWER */
486 gpio-key,wakeup; 489 gpio-key,wakeup;
487 }; 490 };
@@ -492,7 +495,7 @@
492 495
493 wifi { 496 wifi {
494 label = "wifi-led"; 497 label = "wifi-led";
495 gpios = <&gpio 24 0>; /* gpio PD0 */ 498 gpios = <&gpio TEGRA_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
496 linux,default-trigger = "rfkill0"; 499 linux,default-trigger = "rfkill0";
497 }; 500 };
498 }; 501 };
@@ -529,7 +532,8 @@
529 532
530 nvidia,audio-codec = <&alc5632>; 533 nvidia,audio-codec = <&alc5632>;
531 nvidia,i2s-controller = <&tegra_i2s1>; 534 nvidia,i2s-controller = <&tegra_i2s1>;
532 nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ 535 nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2)
536 GPIO_ACTIVE_HIGH>;
533 537
534 clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>; 538 clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
535 clock-names = "pll_a", "pll_a_out0", "mclk"; 539 clock-names = "pll_a", "pll_a_out0", "mclk";
diff --git a/arch/arm/boot/dts/tegra20-plutux.dts b/arch/arm/boot/dts/tegra20-plutux.dts
index 508e56a2e1f1..3d8e69be83a5 100644
--- a/arch/arm/boot/dts/tegra20-plutux.dts
+++ b/arch/arm/boot/dts/tegra20-plutux.dts
@@ -17,7 +17,7 @@
17 compatible = "wlf,wm8903"; 17 compatible = "wlf,wm8903";
18 reg = <0x1a>; 18 reg = <0x1a>;
19 interrupt-parent = <&gpio>; 19 interrupt-parent = <&gpio>;
20 interrupts = <187 0x04>; 20 interrupts = <TEGRA_GPIO(X, 3) 0x04>;
21 21
22 gpio-controller; 22 gpio-controller;
23 #gpio-cells = <2>; 23 #gpio-cells = <2>;
@@ -50,8 +50,8 @@
50 nvidia,i2s-controller = <&tegra_i2s1>; 50 nvidia,i2s-controller = <&tegra_i2s1>;
51 nvidia,audio-codec = <&wm8903>; 51 nvidia,audio-codec = <&wm8903>;
52 52
53 nvidia,spkr-en-gpios = <&wm8903 2 0>; 53 nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
54 nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ 54 nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>;
55 55
56 clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>; 56 clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
57 clock-names = "pll_a", "pll_a_out0", "mclk"; 57 clock-names = "pll_a", "pll_a_out0", "mclk";
diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
index 0855b5e581b9..3952757a48e9 100644
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -18,7 +18,8 @@
18 pll-supply = <&hdmi_pll_reg>; 18 pll-supply = <&hdmi_pll_reg>;
19 19
20 nvidia,ddc-i2c-bus = <&hdmi_ddc>; 20 nvidia,ddc-i2c-bus = <&hdmi_ddc>;
21 nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */ 21 nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7)
22 GPIO_ACTIVE_HIGH>;
22 }; 23 };
23 }; 24 };
24 25
@@ -313,7 +314,7 @@
313 compatible = "wlf,wm8903"; 314 compatible = "wlf,wm8903";
314 reg = <0x1a>; 315 reg = <0x1a>;
315 interrupt-parent = <&gpio>; 316 interrupt-parent = <&gpio>;
316 interrupts = <187 0x04>; 317 interrupts = <TEGRA_GPIO(X, 3) 0x04>;
317 318
318 gpio-controller; 319 gpio-controller;
319 #gpio-cells = <2>; 320 #gpio-cells = <2>;
@@ -328,14 +329,14 @@
328 compatible = "isil,isl29018"; 329 compatible = "isil,isl29018";
329 reg = <0x44>; 330 reg = <0x44>;
330 interrupt-parent = <&gpio>; 331 interrupt-parent = <&gpio>;
331 interrupts = <202 0x04>; /* GPIO PZ2 */ 332 interrupts = <TEGRA_GPIO(Z, 2) 0x04>;
332 }; 333 };
333 334
334 gyrometer@68 { 335 gyrometer@68 {
335 compatible = "invn,mpu3050"; 336 compatible = "invn,mpu3050";
336 reg = <0x68>; 337 reg = <0x68>;
337 interrupt-parent = <&gpio>; 338 interrupt-parent = <&gpio>;
338 interrupts = <204 0x04>; /* gpio PZ4 */ 339 interrupts = <TEGRA_GPIO(Z, 4) 0x04>;
339 }; 340 };
340 }; 341 };
341 342
@@ -511,7 +512,7 @@
511 compatible = "ak,ak8975"; 512 compatible = "ak,ak8975";
512 reg = <0xc>; 513 reg = <0xc>;
513 interrupt-parent = <&gpio>; 514 interrupt-parent = <&gpio>;
514 interrupts = <109 0x04>; /* gpio PN5 */ 515 interrupts = <TEGRA_GPIO(N, 5) 0x04>;
515 }; 516 };
516 }; 517 };
517 518
@@ -565,7 +566,7 @@
565 566
566 usb@c5000000 { 567 usb@c5000000 {
567 status = "okay"; 568 status = "okay";
568 nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */ 569 nvidia,vbus-gpio = <&gpio TEGRA_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
569 dr_mode = "otg"; 570 dr_mode = "otg";
570 }; 571 };
571 572
@@ -577,12 +578,14 @@
577 578
578 usb@c5004000 { 579 usb@c5004000 {
579 status = "okay"; 580 status = "okay";
580 nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */ 581 nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
582 GPIO_ACTIVE_LOW>;
581 }; 583 };
582 584
583 usb-phy@c5004000 { 585 usb-phy@c5004000 {
584 status = "okay"; 586 status = "okay";
585 nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */ 587 nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
588 GPIO_ACTIVE_LOW>;
586 }; 589 };
587 590
588 usb@c5008000 { 591 usb@c5008000 {
@@ -595,16 +598,16 @@
595 598
596 sdhci@c8000000 { 599 sdhci@c8000000 {
597 status = "okay"; 600 status = "okay";
598 power-gpios = <&gpio 86 0>; /* gpio PK6 */ 601 power-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
599 bus-width = <4>; 602 bus-width = <4>;
600 keep-power-in-suspend; 603 keep-power-in-suspend;
601 }; 604 };
602 605
603 sdhci@c8000400 { 606 sdhci@c8000400 {
604 status = "okay"; 607 status = "okay";
605 cd-gpios = <&gpio 69 1>; /* gpio PI5 */ 608 cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
606 wp-gpios = <&gpio 57 0>; /* gpio PH1 */ 609 wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
607 power-gpios = <&gpio 70 0>; /* gpio PI6 */ 610 power-gpios = <&gpio TEGRA_GPIO(I, 6) GPIO_ACTIVE_HIGH>;
608 bus-width = <4>; 611 bus-width = <4>;
609 }; 612 };
610 613
@@ -632,14 +635,14 @@
632 635
633 power { 636 power {
634 label = "Power"; 637 label = "Power";
635 gpios = <&gpio 170 1>; /* gpio PV2, active low */ 638 gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
636 linux,code = <116>; /* KEY_POWER */ 639 linux,code = <116>; /* KEY_POWER */
637 gpio-key,wakeup; 640 gpio-key,wakeup;
638 }; 641 };
639 642
640 lid { 643 lid {
641 label = "Lid"; 644 label = "Lid";
642 gpios = <&gpio 23 0>; /* gpio PC7 */ 645 gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_HIGH>;
643 linux,input-type = <5>; /* EV_SW */ 646 linux,input-type = <5>; /* EV_SW */
644 linux,code = <0>; /* SW_LID */ 647 linux,code = <0>; /* SW_LID */
645 debounce-interval = <1>; 648 debounce-interval = <1>;
@@ -806,7 +809,7 @@
806 regulator-name = "vdd_1v5"; 809 regulator-name = "vdd_1v5";
807 regulator-min-microvolt = <1500000>; 810 regulator-min-microvolt = <1500000>;
808 regulator-max-microvolt = <1500000>; 811 regulator-max-microvolt = <1500000>;
809 gpio = <&pmic 0 0>; 812 gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
810 }; 813 };
811 814
812 regulator@2 { 815 regulator@2 {
@@ -815,7 +818,7 @@
815 regulator-name = "vdd_1v2"; 818 regulator-name = "vdd_1v2";
816 regulator-min-microvolt = <1200000>; 819 regulator-min-microvolt = <1200000>;
817 regulator-max-microvolt = <1200000>; 820 regulator-max-microvolt = <1200000>;
818 gpio = <&pmic 1 0>; 821 gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
819 enable-active-high; 822 enable-active-high;
820 }; 823 };
821 824
@@ -847,8 +850,8 @@
847 nvidia,i2s-controller = <&tegra_i2s1>; 850 nvidia,i2s-controller = <&tegra_i2s1>;
848 nvidia,audio-codec = <&wm8903>; 851 nvidia,audio-codec = <&wm8903>;
849 852
850 nvidia,spkr-en-gpios = <&wm8903 2 0>; 853 nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
851 nvidia,hp-det-gpios = <&gpio 185 0>; /* gpio PX1 */ 854 nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(X, 1) GPIO_ACTIVE_HIGH>;
852 855
853 clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>; 856 clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
854 clock-names = "pll_a", "pll_a_out0", "mclk"; 857 clock-names = "pll_a", "pll_a_out0", "mclk";
diff --git a/arch/arm/boot/dts/tegra20-tamonten.dtsi b/arch/arm/boot/dts/tegra20-tamonten.dtsi
index 4e18fdf3d635..321cb20b045f 100644
--- a/arch/arm/boot/dts/tegra20-tamonten.dtsi
+++ b/arch/arm/boot/dts/tegra20-tamonten.dtsi
@@ -14,7 +14,8 @@
14 pll-supply = <&hdmi_pll_reg>; 14 pll-supply = <&hdmi_pll_reg>;
15 15
16 nvidia,ddc-i2c-bus = <&hdmi_ddc>; 16 nvidia,ddc-i2c-bus = <&hdmi_ddc>;
17 nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */ 17 nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7)
18 GPIO_ACTIVE_HIGH>;
18 }; 19 };
19 }; 20 };
20 21
@@ -475,8 +476,8 @@
475 }; 476 };
476 477
477 sdhci@c8000600 { 478 sdhci@c8000600 {
478 cd-gpios = <&gpio 58 1>; /* gpio PH2 */ 479 cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;
479 wp-gpios = <&gpio 59 0>; /* gpio PH3 */ 480 wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
480 bus-width = <4>; 481 bus-width = <4>;
481 status = "okay"; 482 status = "okay";
482 }; 483 };
diff --git a/arch/arm/boot/dts/tegra20-tec.dts b/arch/arm/boot/dts/tegra20-tec.dts
index 9a2a6a45aedd..db58bb7ff9e5 100644
--- a/arch/arm/boot/dts/tegra20-tec.dts
+++ b/arch/arm/boot/dts/tegra20-tec.dts
@@ -17,7 +17,7 @@
17 compatible = "wlf,wm8903"; 17 compatible = "wlf,wm8903";
18 reg = <0x1a>; 18 reg = <0x1a>;
19 interrupt-parent = <&gpio>; 19 interrupt-parent = <&gpio>;
20 interrupts = <187 0x04>; 20 interrupts = <TEGRA_GPIO(X, 3) 0x04>;
21 21
22 gpio-controller; 22 gpio-controller;
23 #gpio-cells = <2>; 23 #gpio-cells = <2>;
@@ -50,8 +50,9 @@
50 nvidia,i2s-controller = <&tegra_i2s1>; 50 nvidia,i2s-controller = <&tegra_i2s1>;
51 nvidia,audio-codec = <&wm8903>; 51 nvidia,audio-codec = <&wm8903>;
52 52
53 nvidia,spkr-en-gpios = <&wm8903 2 0>; 53 nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
54 nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ 54 nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2)
55 GPIO_ACTIVE_HIGH>;
55 56
56 clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>; 57 clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
57 clock-names = "pll_a", "pll_a_out0", "mclk"; 58 clock-names = "pll_a", "pll_a_out0", "mclk";
diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index d2966b2788c4..4257ab44fe84 100644
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -18,7 +18,8 @@
18 pll-supply = <&hdmi_pll_reg>; 18 pll-supply = <&hdmi_pll_reg>;
19 19
20 nvidia,ddc-i2c-bus = <&hdmi_ddc>; 20 nvidia,ddc-i2c-bus = <&hdmi_ddc>;
21 nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */ 21 nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7)
22 GPIO_ACTIVE_HIGH>;
22 }; 23 };
23 }; 24 };
24 25
@@ -311,7 +312,7 @@
311 312
312 usb@c5000000 { 313 usb@c5000000 {
313 status = "okay"; 314 status = "okay";
314 nvidia,vbus-gpio = <&gpio 170 0>; /* gpio PV2 */ 315 nvidia,vbus-gpio = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
315 }; 316 };
316 317
317 usb-phy@c5000000 { 318 usb-phy@c5000000 {
@@ -321,12 +322,14 @@
321 322
322 usb@c5004000 { 323 usb@c5004000 {
323 status = "okay"; 324 status = "okay";
324 nvidia,phy-reset-gpio = <&gpio 168 1>; /* gpio PV0, active low */ 325 nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 0)
326 GPIO_ACTIVE_LOW>;
325 }; 327 };
326 328
327 usb-phy@c5004000 { 329 usb-phy@c5004000 {
328 status = "okay"; 330 status = "okay";
329 nvidia,phy-reset-gpio = <&gpio 168 1>; /* gpio PV0, active low */ 331 nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 0)
332 GPIO_ACTIVE_LOW>;
330 }; 333 };
331 334
332 usb@c5008000 { 335 usb@c5008000 {
@@ -344,8 +347,8 @@
344 347
345 sdhci@c8000600 { 348 sdhci@c8000600 {
346 status = "okay"; 349 status = "okay";
347 cd-gpios = <&gpio 121 1>; /* gpio PP1 */ 350 cd-gpios = <&gpio TEGRA_GPIO(P, 1) GPIO_ACTIVE_LOW>;
348 wp-gpios = <&gpio 122 0>; /* gpio PP2 */ 351 wp-gpios = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;
349 bus-width = <4>; 352 bus-width = <4>;
350 }; 353 };
351 354
@@ -367,7 +370,7 @@
367 370
368 power { 371 power {
369 label = "Power"; 372 label = "Power";
370 gpios = <&gpio 190 1>; /* gpio PX6, active low */ 373 gpios = <&gpio TEGRA_GPIO(X, 6) GPIO_ACTIVE_LOW>;
371 linux,code = <116>; /* KEY_POWER */ 374 linux,code = <116>; /* KEY_POWER */
372 gpio-key,wakeup; 375 gpio-key,wakeup;
373 }; 376 };
@@ -375,7 +378,7 @@
375 378
376 poweroff { 379 poweroff {
377 compatible = "gpio-poweroff"; 380 compatible = "gpio-poweroff";
378 gpios = <&gpio 191 1>; /* gpio PX7, active low */ 381 gpios = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_LOW>;
379 }; 382 };
380 383
381 regulators { 384 regulators {
diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts
index 51feeb4fb581..ff8817b86c1a 100644
--- a/arch/arm/boot/dts/tegra20-ventana.dts
+++ b/arch/arm/boot/dts/tegra20-ventana.dts
@@ -18,7 +18,8 @@
18 pll-supply = <&hdmi_pll_reg>; 18 pll-supply = <&hdmi_pll_reg>;
19 19
20 nvidia,ddc-i2c-bus = <&hdmi_ddc>; 20 nvidia,ddc-i2c-bus = <&hdmi_ddc>;
21 nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */ 21 nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7)
22 GPIO_ACTIVE_HIGH>;
22 }; 23 };
23 }; 24 };
24 25
@@ -310,7 +311,7 @@
310 compatible = "wlf,wm8903"; 311 compatible = "wlf,wm8903";
311 reg = <0x1a>; 312 reg = <0x1a>;
312 interrupt-parent = <&gpio>; 313 interrupt-parent = <&gpio>;
313 interrupts = <187 0x04>; 314 interrupts = <TEGRA_GPIO(X, 3) 0x04>;
314 315
315 gpio-controller; 316 gpio-controller;
316 #gpio-cells = <2>; 317 #gpio-cells = <2>;
@@ -325,7 +326,7 @@
325 compatible = "isil,isl29018"; 326 compatible = "isil,isl29018";
326 reg = <0x44>; 327 reg = <0x44>;
327 interrupt-parent = <&gpio>; 328 interrupt-parent = <&gpio>;
328 interrupts = <202 0x04>; /*gpio PZ2 */ 329 interrupts = <TEGRA_GPIO(Z, 2) 0x04>;
329 }; 330 };
330 }; 331 };
331 332
@@ -511,12 +512,14 @@
511 512
512 usb@c5004000 { 513 usb@c5004000 {
513 status = "okay"; 514 status = "okay";
514 nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */ 515 nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
516 GPIO_ACTIVE_LOW>;
515 }; 517 };
516 518
517 usb-phy@c5004000 { 519 usb-phy@c5004000 {
518 status = "okay"; 520 status = "okay";
519 nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */ 521 nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
522 GPIO_ACTIVE_LOW>;
520 }; 523 };
521 524
522 usb@c5008000 { 525 usb@c5008000 {
@@ -529,16 +532,16 @@
529 532
530 sdhci@c8000000 { 533 sdhci@c8000000 {
531 status = "okay"; 534 status = "okay";
532 power-gpios = <&gpio 86 0>; /* gpio PK6 */ 535 power-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
533 bus-width = <4>; 536 bus-width = <4>;
534 keep-power-in-suspend; 537 keep-power-in-suspend;
535 }; 538 };
536 539
537 sdhci@c8000400 { 540 sdhci@c8000400 {
538 status = "okay"; 541 status = "okay";
539 cd-gpios = <&gpio 69 1>; /* gpio PI5 */ 542 cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
540 wp-gpios = <&gpio 57 0>; /* gpio PH1 */ 543 wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
541 power-gpios = <&gpio 70 0>; /* gpio PI6 */ 544 power-gpios = <&gpio TEGRA_GPIO(I, 6) GPIO_ACTIVE_HIGH>;
542 bus-width = <4>; 545 bus-width = <4>;
543 }; 546 };
544 547
@@ -566,7 +569,7 @@
566 569
567 power { 570 power {
568 label = "Power"; 571 label = "Power";
569 gpios = <&gpio 170 1>; /* gpio PV2, active low */ 572 gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
570 linux,code = <116>; /* KEY_POWER */ 573 linux,code = <116>; /* KEY_POWER */
571 gpio-key,wakeup; 574 gpio-key,wakeup;
572 }; 575 };
@@ -592,7 +595,7 @@
592 regulator-name = "vdd_1v5"; 595 regulator-name = "vdd_1v5";
593 regulator-min-microvolt = <1500000>; 596 regulator-min-microvolt = <1500000>;
594 regulator-max-microvolt = <1500000>; 597 regulator-max-microvolt = <1500000>;
595 gpio = <&pmic 0 0>; 598 gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
596 }; 599 };
597 600
598 regulator@2 { 601 regulator@2 {
@@ -601,7 +604,7 @@
601 regulator-name = "vdd_1v2"; 604 regulator-name = "vdd_1v2";
602 regulator-min-microvolt = <1200000>; 605 regulator-min-microvolt = <1200000>;
603 regulator-max-microvolt = <1200000>; 606 regulator-max-microvolt = <1200000>;
604 gpio = <&pmic 1 0>; 607 gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
605 enable-active-high; 608 enable-active-high;
606 }; 609 };
607 610
@@ -611,7 +614,7 @@
611 regulator-name = "vdd_pnl"; 614 regulator-name = "vdd_pnl";
612 regulator-min-microvolt = <2800000>; 615 regulator-min-microvolt = <2800000>;
613 regulator-max-microvolt = <2800000>; 616 regulator-max-microvolt = <2800000>;
614 gpio = <&gpio 22 0>; /* gpio PC6 */ 617 gpio = <&gpio TEGRA_GPIO(C, 6) GPIO_ACTIVE_HIGH>;
615 enable-active-high; 618 enable-active-high;
616 }; 619 };
617 620
@@ -621,7 +624,7 @@
621 regulator-name = "vdd_bl"; 624 regulator-name = "vdd_bl";
622 regulator-min-microvolt = <2800000>; 625 regulator-min-microvolt = <2800000>;
623 regulator-max-microvolt = <2800000>; 626 regulator-max-microvolt = <2800000>;
624 gpio = <&gpio 176 0>; /* gpio PW0 */ 627 gpio = <&gpio TEGRA_GPIO(W, 0) GPIO_ACTIVE_HIGH>;
625 enable-active-high; 628 enable-active-high;
626 }; 629 };
627 }; 630 };
@@ -644,10 +647,12 @@
644 nvidia,i2s-controller = <&tegra_i2s1>; 647 nvidia,i2s-controller = <&tegra_i2s1>;
645 nvidia,audio-codec = <&wm8903>; 648 nvidia,audio-codec = <&wm8903>;
646 649
647 nvidia,spkr-en-gpios = <&wm8903 2 0>; 650 nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
648 nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ 651 nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>;
649 nvidia,int-mic-en-gpios = <&gpio 184 0>; /* gpio PX0 */ 652 nvidia,int-mic-en-gpios = <&gpio TEGRA_GPIO(X, 0)
650 nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */ 653 GPIO_ACTIVE_HIGH>;
654 nvidia,ext-mic-en-gpios = <&gpio TEGRA_GPIO(X, 1)
655 GPIO_ACTIVE_HIGH>;
651 656
652 clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>; 657 clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
653 clock-names = "pll_a", "pll_a_out0", "mclk"; 658 clock-names = "pll_a", "pll_a_out0", "mclk";
diff --git a/arch/arm/boot/dts/tegra20-whistler.dts b/arch/arm/boot/dts/tegra20-whistler.dts
index 1748be545905..9a773bb9da71 100644
--- a/arch/arm/boot/dts/tegra20-whistler.dts
+++ b/arch/arm/boot/dts/tegra20-whistler.dts
@@ -18,7 +18,8 @@
18 pll-supply = <&hdmi_pll_reg>; 18 pll-supply = <&hdmi_pll_reg>;
19 19
20 nvidia,ddc-i2c-bus = <&hdmi_ddc>; 20 nvidia,ddc-i2c-bus = <&hdmi_ddc>;
21 nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */ 21 nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7)
22 GPIO_ACTIVE_HIGH>;
22 }; 23 };
23 }; 24 };
24 25
@@ -508,7 +509,7 @@
508 509
509 usb@c5000000 { 510 usb@c5000000 {
510 status = "okay"; 511 status = "okay";
511 nvidia,vbus-gpio = <&tca6416 0 0>; /* GPIO_PMU0 */ 512 nvidia,vbus-gpio = <&tca6416 0 GPIO_ACTIVE_HIGH>;
512 }; 513 };
513 514
514 usb-phy@c5000000 { 515 usb-phy@c5000000 {
@@ -518,7 +519,7 @@
518 519
519 usb@c5008000 { 520 usb@c5008000 {
520 status = "okay"; 521 status = "okay";
521 nvidia,vbus-gpio = <&tca6416 1 0>; /* GPIO_PMU1 */ 522 nvidia,vbus-gpio = <&tca6416 1 GPIO_ACTIVE_HIGH>;
522 }; 523 };
523 524
524 usb-phy@c5008000 { 525 usb-phy@c5008000 {
@@ -528,8 +529,8 @@
528 529
529 sdhci@c8000400 { 530 sdhci@c8000400 {
530 status = "okay"; 531 status = "okay";
531 cd-gpios = <&gpio 69 1>; /* gpio PI5 */ 532 cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
532 wp-gpios = <&gpio 173 0>; /* gpio PV5 */ 533 wp-gpios = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_HIGH>;
533 bus-width = <8>; 534 bus-width = <8>;
534 }; 535 };
535 536
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index cde2f808b6c0..673f3869c9cc 100644
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -1,3 +1,5 @@
1#include <dt-bindings/gpio/tegra-gpio.h>
2
1#include "skeleton.dtsi" 3#include "skeleton.dtsi"
2 4
3/ { 5/ {
diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts
index e86c2805dcb6..40b0bd700b41 100644
--- a/arch/arm/boot/dts/tegra30-beaver.dts
+++ b/arch/arm/boot/dts/tegra30-beaver.dts
@@ -264,9 +264,9 @@
264 264
265 sdhci@78000000 { 265 sdhci@78000000 {
266 status = "okay"; 266 status = "okay";
267 cd-gpios = <&gpio 69 1>; /* gpio PI5 */ 267 cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
268 wp-gpios = <&gpio 155 0>; /* gpio PT3 */ 268 wp-gpios = <&gpio TEGRA_GPIO(T, 3) GPIO_ACTIVE_HIGH>;
269 power-gpios = <&gpio 31 0>; /* gpio PD7 */ 269 power-gpios = <&gpio TEGRA_GPIO(D, 7) GPIO_ACTIVE_HIGH>;
270 bus-width = <4>; 270 bus-width = <4>;
271 }; 271 };
272 272
@@ -312,7 +312,7 @@
312 regulator-boot-on; 312 regulator-boot-on;
313 regulator-always-on; 313 regulator-always-on;
314 enable-active-high; 314 enable-active-high;
315 gpio = <&pmic 0 0>; /* PMIC TPS65911 GPIO0 */ 315 gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
316 }; 316 };
317 317
318 ddr_reg: regulator@2 { 318 ddr_reg: regulator@2 {
@@ -324,7 +324,7 @@
324 regulator-always-on; 324 regulator-always-on;
325 regulator-boot-on; 325 regulator-boot-on;
326 enable-active-high; 326 enable-active-high;
327 gpio = <&pmic 7 0>; /* PMIC TPS65911 GPIO7 */ 327 gpio = <&pmic 7 GPIO_ACTIVE_HIGH>;
328 vin-supply = <&vdd_5v_in_reg>; 328 vin-supply = <&vdd_5v_in_reg>;
329 }; 329 };
330 330
@@ -337,7 +337,7 @@
337 regulator-always-on; 337 regulator-always-on;
338 regulator-boot-on; 338 regulator-boot-on;
339 enable-active-high; 339 enable-active-high;
340 gpio = <&gpio 30 0>; /* gpio PD6 */ 340 gpio = <&gpio TEGRA_GPIO(D, 6) GPIO_ACTIVE_HIGH>;
341 vin-supply = <&vdd_5v_in_reg>; 341 vin-supply = <&vdd_5v_in_reg>;
342 }; 342 };
343 343
@@ -348,7 +348,7 @@
348 regulator-min-microvolt = <5000000>; 348 regulator-min-microvolt = <5000000>;
349 regulator-max-microvolt = <5000000>; 349 regulator-max-microvolt = <5000000>;
350 enable-active-high; 350 enable-active-high;
351 gpio = <&gpio 68 0>; /* GPIO PI4 */ 351 gpio = <&gpio TEGRA_GPIO(I, 4) GPIO_ACTIVE_HIGH>;
352 gpio-open-drain; 352 gpio-open-drain;
353 vin-supply = <&vdd_5v_in_reg>; 353 vin-supply = <&vdd_5v_in_reg>;
354 }; 354 };
@@ -360,7 +360,7 @@
360 regulator-min-microvolt = <5000000>; 360 regulator-min-microvolt = <5000000>;
361 regulator-max-microvolt = <5000000>; 361 regulator-max-microvolt = <5000000>;
362 enable-active-high; 362 enable-active-high;
363 gpio = <&gpio 63 0>; /* GPIO PH7 */ 363 gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_HIGH>;
364 gpio-open-drain; 364 gpio-open-drain;
365 vin-supply = <&vdd_5v_in_reg>; 365 vin-supply = <&vdd_5v_in_reg>;
366 }; 366 };
@@ -374,7 +374,7 @@
374 regulator-always-on; 374 regulator-always-on;
375 regulator-boot-on; 375 regulator-boot-on;
376 enable-active-high; 376 enable-active-high;
377 gpio = <&pmic 6 0>; /* PMIC TPS65911 GPIO6 */ 377 gpio = <&pmic 6 GPIO_ACTIVE_HIGH>;
378 vin-supply = <&vdd_5v_in_reg>; 378 vin-supply = <&vdd_5v_in_reg>;
379 }; 379 };
380 380
@@ -387,7 +387,7 @@
387 regulator-always-on; 387 regulator-always-on;
388 regulator-boot-on; 388 regulator-boot-on;
389 enable-active-high; 389 enable-active-high;
390 gpio = <&gpio 95 0>; /* gpio PL7 */ 390 gpio = <&gpio TEGRA_GPIO(L, 7) GPIO_ACTIVE_HIGH>;
391 vin-supply = <&sys_3v3_reg>; 391 vin-supply = <&sys_3v3_reg>;
392 }; 392 };
393 }; 393 };
@@ -397,11 +397,11 @@
397 397
398 gpled1 { 398 gpled1 {
399 label = "LED1"; /* CR5A1 (blue) */ 399 label = "LED1"; /* CR5A1 (blue) */
400 gpios = <&gpio 89 0>; /* gpio PL1 */ 400 gpios = <&gpio TEGRA_GPIO(L, 1) GPIO_ACTIVE_HIGH>;
401 }; 401 };
402 gpled2 { 402 gpled2 {
403 label = "LED2"; /* CR4A2 (green) */ 403 label = "LED2"; /* CR4A2 (green) */
404 gpios = <&gpio 88 0>; /* gpio PL0 */ 404 gpios = <&gpio TEGRA_GPIO(L, 0) GPIO_ACTIVE_HIGH>;
405 }; 405 };
406 }; 406 };
407}; 407};
diff --git a/arch/arm/boot/dts/tegra30-cardhu-a02.dts b/arch/arm/boot/dts/tegra30-cardhu-a02.dts
index 3934b0f37f6b..1082c5ed90d1 100644
--- a/arch/arm/boot/dts/tegra30-cardhu-a02.dts
+++ b/arch/arm/boot/dts/tegra30-cardhu-a02.dts
@@ -22,7 +22,7 @@
22 regulator-always-on; 22 regulator-always-on;
23 regulator-boot-on; 23 regulator-boot-on;
24 enable-active-high; 24 enable-active-high;
25 gpio = <&pmic 6 0>; 25 gpio = <&pmic 6 GPIO_ACTIVE_HIGH>;
26 }; 26 };
27 27
28 sys_3v3_reg: regulator@101 { 28 sys_3v3_reg: regulator@101 {
@@ -34,7 +34,7 @@
34 regulator-always-on; 34 regulator-always-on;
35 regulator-boot-on; 35 regulator-boot-on;
36 enable-active-high; 36 enable-active-high;
37 gpio = <&pmic 7 0>; 37 gpio = <&pmic 7 GPIO_ACTIVE_HIGH>;
38 }; 38 };
39 39
40 usb1_vbus_reg: regulator@102 { 40 usb1_vbus_reg: regulator@102 {
@@ -44,7 +44,7 @@
44 regulator-min-microvolt = <5000000>; 44 regulator-min-microvolt = <5000000>;
45 regulator-max-microvolt = <5000000>; 45 regulator-max-microvolt = <5000000>;
46 enable-active-high; 46 enable-active-high;
47 gpio = <&gpio 68 0>; /* GPIO PI4 */ 47 gpio = <&gpio TEGRA_GPIO(I, 4) GPIO_ACTIVE_HIGH>;
48 gpio-open-drain; 48 gpio-open-drain;
49 vin-supply = <&vdd_5v0_reg>; 49 vin-supply = <&vdd_5v0_reg>;
50 }; 50 };
@@ -56,7 +56,7 @@
56 regulator-min-microvolt = <5000000>; 56 regulator-min-microvolt = <5000000>;
57 regulator-max-microvolt = <5000000>; 57 regulator-max-microvolt = <5000000>;
58 enable-active-high; 58 enable-active-high;
59 gpio = <&gpio 63 0>; /* GPIO PH7 */ 59 gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_HIGH>;
60 gpio-open-drain; 60 gpio-open-drain;
61 vin-supply = <&vdd_5v0_reg>; 61 vin-supply = <&vdd_5v0_reg>;
62 }; 62 };
@@ -68,7 +68,7 @@
68 regulator-min-microvolt = <5000000>; 68 regulator-min-microvolt = <5000000>;
69 regulator-max-microvolt = <5000000>; 69 regulator-max-microvolt = <5000000>;
70 enable-active-high; 70 enable-active-high;
71 gpio = <&pmic 2 0>; 71 gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
72 }; 72 };
73 73
74 vdd_bl_reg: regulator@105 { 74 vdd_bl_reg: regulator@105 {
@@ -80,13 +80,13 @@
80 regulator-always-on; 80 regulator-always-on;
81 regulator-boot-on; 81 regulator-boot-on;
82 enable-active-high; 82 enable-active-high;
83 gpio = <&gpio 83 0>; /* GPIO PK3 */ 83 gpio = <&gpio TEGRA_GPIO(K, 3) GPIO_ACTIVE_HIGH>;
84 }; 84 };
85 }; 85 };
86 86
87 sdhci@78000400 { 87 sdhci@78000400 {
88 status = "okay"; 88 status = "okay";
89 power-gpios = <&gpio 28 0>; /* gpio PD4 */ 89 power-gpios = <&gpio TEGRA_GPIO(D, 4) GPIO_ACTIVE_HIGH>;
90 bus-width = <4>; 90 bus-width = <4>;
91 keep-power-in-suspend; 91 keep-power-in-suspend;
92 }; 92 };
diff --git a/arch/arm/boot/dts/tegra30-cardhu-a04.dts b/arch/arm/boot/dts/tegra30-cardhu-a04.dts
index af3ff7a46ee1..bf012bddaafb 100644
--- a/arch/arm/boot/dts/tegra30-cardhu-a04.dts
+++ b/arch/arm/boot/dts/tegra30-cardhu-a04.dts
@@ -22,7 +22,7 @@
22 regulator-always-on; 22 regulator-always-on;
23 regulator-boot-on; 23 regulator-boot-on;
24 enable-active-high; 24 enable-active-high;
25 gpio = <&pmic 7 0>; 25 gpio = <&pmic 7 GPIO_ACTIVE_HIGH>;
26 }; 26 };
27 27
28 sys_3v3_reg: regulator@101 { 28 sys_3v3_reg: regulator@101 {
@@ -34,7 +34,7 @@
34 regulator-always-on; 34 regulator-always-on;
35 regulator-boot-on; 35 regulator-boot-on;
36 enable-active-high; 36 enable-active-high;
37 gpio = <&pmic 6 0>; 37 gpio = <&pmic 6 GPIO_ACTIVE_HIGH>;
38 }; 38 };
39 39
40 usb1_vbus_reg: regulator@102 { 40 usb1_vbus_reg: regulator@102 {
@@ -44,7 +44,7 @@
44 regulator-min-microvolt = <5000000>; 44 regulator-min-microvolt = <5000000>;
45 regulator-max-microvolt = <5000000>; 45 regulator-max-microvolt = <5000000>;
46 enable-active-high; 46 enable-active-high;
47 gpio = <&gpio 238 0>; /* GPIO PDD6 */ 47 gpio = <&gpio TEGRA_GPIO(DD, 6) GPIO_ACTIVE_HIGH>;
48 gpio-open-drain; 48 gpio-open-drain;
49 vin-supply = <&vdd_5v0_reg>; 49 vin-supply = <&vdd_5v0_reg>;
50 }; 50 };
@@ -56,7 +56,7 @@
56 regulator-min-microvolt = <5000000>; 56 regulator-min-microvolt = <5000000>;
57 regulator-max-microvolt = <5000000>; 57 regulator-max-microvolt = <5000000>;
58 enable-active-high; 58 enable-active-high;
59 gpio = <&gpio 236 0>; /* GPIO PDD4 */ 59 gpio = <&gpio TEGRA_GPIO(DD, 4) GPIO_ACTIVE_HIGH>;
60 gpio-open-drain; 60 gpio-open-drain;
61 vin-supply = <&vdd_5v0_reg>; 61 vin-supply = <&vdd_5v0_reg>;
62 }; 62 };
@@ -68,7 +68,7 @@
68 regulator-min-microvolt = <5000000>; 68 regulator-min-microvolt = <5000000>;
69 regulator-max-microvolt = <5000000>; 69 regulator-max-microvolt = <5000000>;
70 enable-active-high; 70 enable-active-high;
71 gpio = <&pmic 8 0>; 71 gpio = <&pmic 8 GPIO_ACTIVE_HIGH>;
72 }; 72 };
73 73
74 vdd_bl_reg: regulator@105 { 74 vdd_bl_reg: regulator@105 {
@@ -80,7 +80,7 @@
80 regulator-always-on; 80 regulator-always-on;
81 regulator-boot-on; 81 regulator-boot-on;
82 enable-active-high; 82 enable-active-high;
83 gpio = <&gpio 234 0>; /* GPIO PDD2 */ 83 gpio = <&gpio TEGRA_GPIO(DD, 2) GPIO_ACTIVE_HIGH>;
84 }; 84 };
85 85
86 vdd_bl2_reg: regulator@106 { 86 vdd_bl2_reg: regulator@106 {
@@ -92,13 +92,13 @@
92 regulator-always-on; 92 regulator-always-on;
93 regulator-boot-on; 93 regulator-boot-on;
94 enable-active-high; 94 enable-active-high;
95 gpio = <&gpio 232 0>; /* GPIO PDD0 */ 95 gpio = <&gpio TEGRA_GPIO(DD, 0) GPIO_ACTIVE_HIGH>;
96 }; 96 };
97 }; 97 };
98 98
99 sdhci@78000400 { 99 sdhci@78000400 {
100 status = "okay"; 100 status = "okay";
101 power-gpios = <&gpio 27 0>; /* gpio PD3 */ 101 power-gpios = <&gpio TEGRA_GPIO(D, 3) GPIO_ACTIVE_HIGH>;
102 bus-width = <4>; 102 bus-width = <4>;
103 keep-power-in-suspend; 103 keep-power-in-suspend;
104 }; 104 };
diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index e54eed2d610e..c177fd9fe6d8 100644
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -146,7 +146,7 @@
146 compatible = "isil,isl29028"; 146 compatible = "isil,isl29028";
147 reg = <0x44>; 147 reg = <0x44>;
148 interrupt-parent = <&gpio>; 148 interrupt-parent = <&gpio>;
149 interrupts = <88 0x04>; /*gpio PL0 */ 149 interrupts = <TEGRA_GPIO(L, 0) 0x04>;
150 }; 150 };
151 }; 151 };
152 152
@@ -163,7 +163,7 @@
163 compatible = "wlf,wm8903"; 163 compatible = "wlf,wm8903";
164 reg = <0x1a>; 164 reg = <0x1a>;
165 interrupt-parent = <&gpio>; 165 interrupt-parent = <&gpio>;
166 interrupts = <179 0x04>; /* gpio PW3 */ 166 interrupts = <TEGRA_GPIO(W, 3) 0x04>;
167 167
168 gpio-controller; 168 gpio-controller;
169 #gpio-cells = <2>; 169 #gpio-cells = <2>;
@@ -318,9 +318,9 @@
318 318
319 sdhci@78000000 { 319 sdhci@78000000 {
320 status = "okay"; 320 status = "okay";
321 cd-gpios = <&gpio 69 1>; /* gpio PI5 */ 321 cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
322 wp-gpios = <&gpio 155 0>; /* gpio PT3 */ 322 wp-gpios = <&gpio TEGRA_GPIO(T, 3) GPIO_ACTIVE_HIGH>;
323 power-gpios = <&gpio 31 0>; /* gpio PD7 */ 323 power-gpios = <&gpio TEGRA_GPIO(D, 7) GPIO_ACTIVE_HIGH>;
324 bus-width = <4>; 324 bus-width = <4>;
325 }; 325 };
326 326
@@ -364,7 +364,7 @@
364 regulator-min-microvolt = <1800000>; 364 regulator-min-microvolt = <1800000>;
365 regulator-max-microvolt = <1800000>; 365 regulator-max-microvolt = <1800000>;
366 enable-active-high; 366 enable-active-high;
367 gpio = <&gpio 220 0>; /* gpio PBB4 */ 367 gpio = <&gpio TEGRA_GPIO(BB, 4) GPIO_ACTIVE_HIGH>;
368 vin-supply = <&vio_reg>; 368 vin-supply = <&vio_reg>;
369 }; 369 };
370 370
@@ -377,7 +377,7 @@
377 regulator-boot-on; 377 regulator-boot-on;
378 regulator-always-on; 378 regulator-always-on;
379 enable-active-high; 379 enable-active-high;
380 gpio = <&pmic 0 0>; /* PMIC TPS65911 GPIO0 */ 380 gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
381 }; 381 };
382 382
383 emmc_3v3_reg: regulator@3 { 383 emmc_3v3_reg: regulator@3 {
@@ -389,7 +389,7 @@
389 regulator-always-on; 389 regulator-always-on;
390 regulator-boot-on; 390 regulator-boot-on;
391 enable-active-high; 391 enable-active-high;
392 gpio = <&gpio 25 0>; /* gpio PD1 */ 392 gpio = <&gpio TEGRA_GPIO(D, 1) GPIO_ACTIVE_HIGH>;
393 vin-supply = <&sys_3v3_reg>; 393 vin-supply = <&sys_3v3_reg>;
394 }; 394 };
395 395
@@ -400,7 +400,7 @@
400 regulator-min-microvolt = <3300000>; 400 regulator-min-microvolt = <3300000>;
401 regulator-max-microvolt = <3300000>; 401 regulator-max-microvolt = <3300000>;
402 enable-active-high; 402 enable-active-high;
403 gpio = <&gpio 30 0>; /* gpio PD6 */ 403 gpio = <&gpio TEGRA_GPIO(D, 6) GPIO_ACTIVE_HIGH>;
404 }; 404 };
405 405
406 pex_hvdd_3v3_reg: regulator@5 { 406 pex_hvdd_3v3_reg: regulator@5 {
@@ -410,7 +410,7 @@
410 regulator-min-microvolt = <3300000>; 410 regulator-min-microvolt = <3300000>;
411 regulator-max-microvolt = <3300000>; 411 regulator-max-microvolt = <3300000>;
412 enable-active-high; 412 enable-active-high;
413 gpio = <&gpio 95 0>; /* gpio PL7 */ 413 gpio = <&gpio TEGRA_GPIO(L, 7) GPIO_ACTIVE_HIGH>;
414 vin-supply = <&sys_3v3_reg>; 414 vin-supply = <&sys_3v3_reg>;
415 }; 415 };
416 416
@@ -421,7 +421,7 @@
421 regulator-min-microvolt = <2800000>; 421 regulator-min-microvolt = <2800000>;
422 regulator-max-microvolt = <2800000>; 422 regulator-max-microvolt = <2800000>;
423 enable-active-high; 423 enable-active-high;
424 gpio = <&gpio 142 0>; /* gpio PR6 */ 424 gpio = <&gpio TEGRA_GPIO(R, 6) GPIO_ACTIVE_HIGH>;
425 vin-supply = <&sys_3v3_reg>; 425 vin-supply = <&sys_3v3_reg>;
426 }; 426 };
427 427
@@ -432,7 +432,7 @@
432 regulator-min-microvolt = <2800000>; 432 regulator-min-microvolt = <2800000>;
433 regulator-max-microvolt = <2800000>; 433 regulator-max-microvolt = <2800000>;
434 enable-active-high; 434 enable-active-high;
435 gpio = <&gpio 143 0>; /* gpio PR7 */ 435 gpio = <&gpio TEGRA_GPIO(R, 7) GPIO_ACTIVE_HIGH>;
436 vin-supply = <&sys_3v3_reg>; 436 vin-supply = <&sys_3v3_reg>;
437 }; 437 };
438 438
@@ -443,7 +443,7 @@
443 regulator-min-microvolt = <3300000>; 443 regulator-min-microvolt = <3300000>;
444 regulator-max-microvolt = <3300000>; 444 regulator-max-microvolt = <3300000>;
445 enable-active-high; 445 enable-active-high;
446 gpio = <&gpio 144 0>; /* gpio PS0 */ 446 gpio = <&gpio TEGRA_GPIO(S, 0) GPIO_ACTIVE_HIGH>;
447 vin-supply = <&sys_3v3_reg>; 447 vin-supply = <&sys_3v3_reg>;
448 }; 448 };
449 449
@@ -456,7 +456,7 @@
456 regulator-always-on; 456 regulator-always-on;
457 regulator-boot-on; 457 regulator-boot-on;
458 enable-active-high; 458 enable-active-high;
459 gpio = <&gpio 24 0>; /* gpio PD0 */ 459 gpio = <&gpio TEGRA_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
460 vin-supply = <&sys_3v3_reg>; 460 vin-supply = <&sys_3v3_reg>;
461 }; 461 };
462 462
@@ -467,7 +467,7 @@
467 regulator-min-microvolt = <3300000>; 467 regulator-min-microvolt = <3300000>;
468 regulator-max-microvolt = <3300000>; 468 regulator-max-microvolt = <3300000>;
469 enable-active-high; 469 enable-active-high;
470 gpio = <&gpio 94 0>; /* gpio PL6 */ 470 gpio = <&gpio TEGRA_GPIO(L, 6) GPIO_ACTIVE_HIGH>;
471 vin-supply = <&sys_3v3_reg>; 471 vin-supply = <&sys_3v3_reg>;
472 }; 472 };
473 473
@@ -480,7 +480,7 @@
480 regulator-always-on; 480 regulator-always-on;
481 regulator-boot-on; 481 regulator-boot-on;
482 enable-active-high; 482 enable-active-high;
483 gpio = <&gpio 92 0>; /* gpio PL4 */ 483 gpio = <&gpio TEGRA_GPIO(L, 4) GPIO_ACTIVE_HIGH>;
484 vin-supply = <&sys_3v3_reg>; 484 vin-supply = <&sys_3v3_reg>;
485 }; 485 };
486 486
@@ -491,7 +491,7 @@
491 regulator-min-microvolt = <5000000>; 491 regulator-min-microvolt = <5000000>;
492 regulator-max-microvolt = <5000000>; 492 regulator-max-microvolt = <5000000>;
493 enable-active-high; 493 enable-active-high;
494 gpio = <&gpio 152 0>; /* GPIO PT0 */ 494 gpio = <&gpio TEGRA_GPIO(T, 0) GPIO_ACTIVE_HIGH>;
495 gpio-open-drain; 495 gpio-open-drain;
496 vin-supply = <&vdd_5v0_reg>; 496 vin-supply = <&vdd_5v0_reg>;
497 }; 497 };
@@ -515,8 +515,9 @@
515 nvidia,i2s-controller = <&tegra_i2s1>; 515 nvidia,i2s-controller = <&tegra_i2s1>;
516 nvidia,audio-codec = <&wm8903>; 516 nvidia,audio-codec = <&wm8903>;
517 517
518 nvidia,spkr-en-gpios = <&wm8903 2 0>; 518 nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
519 nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ 519 nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2)
520 GPIO_ACTIVE_HIGH>;
520 521
521 clocks = <&tegra_car 184>, <&tegra_car 185>, <&tegra_car 120>; 522 clocks = <&tegra_car 184>, <&tegra_car 185>, <&tegra_car 120>;
522 clock-names = "pll_a", "pll_a_out0", "mclk"; 523 clock-names = "pll_a", "pll_a_out0", "mclk";
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
index 38967fde6486..1fe8c3abc2f4 100644
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -1,3 +1,5 @@
1#include <dt-bindings/gpio/tegra-gpio.h>
2
1#include "skeleton.dtsi" 3#include "skeleton.dtsi"
2 4
3/ { 5/ {
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-03 23:33:17 -0500