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>

diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts
index acc5257041d044a109f2f7f9ea982a7ff71a5001..2571525769ce317a8058b80c0ae2524658890a24 100644 (file)
--- a/arch/arm/boot/dts/tegra114-dalmore.dts
+++ b/arch/arm/boot/dts/tegra114-dalmore.dts
@@ -838,7 +838,7 @@
        };
 
        sdhci@78000400 {
-               cd-gpios = <&gpio 170 1>; /* gpio PV2 */
+               cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
                bus-width = <4>;
                status = "okay";
        };
@@ -883,7 +883,7 @@
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                        enable-active-high;
-                       gpio = <&gpio 61 0>; /* GPIO PH5 */
+                       gpio = <&gpio TEGRA_GPIO(H, 5) GPIO_ACTIVE_HIGH>;
                };
 
                lcd_bl_en_reg: regulator@2 {
@@ -893,7 +893,7 @@
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
                        enable-active-high;
-                       gpio = <&gpio 58 0>; /* GPIO PH2 */
+                       gpio = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_HIGH>;
                };
 
                usb1_vbus_reg: regulator@3 {
@@ -903,7 +903,7 @@
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
                        enable-active-high;
-                       gpio = <&gpio 108 0>; /* GPIO PN4 */
+                       gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
                        gpio-open-drain;
                        vin-supply = <&tps65090_dcdc1_reg>;
                };
@@ -915,7 +915,7 @@
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
                        enable-active-high;
-                       gpio = <&gpio 86 0>; /* GPIO PK6 */
+                       gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
                        gpio-open-drain;
                        vin-supply = <&tps65090_dcdc1_reg>;
                };
@@ -927,7 +927,7 @@
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
                        enable-active-high;
-                       gpio = <&gpio 81 0>; /* GPIO PK1 */
+                       gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;
                        vin-supply = <&tps65090_dcdc1_reg>;
                };
        };

diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi
index aeeb53b12d299e38367390044be15a2f2b777b2e..6cd6d413191afe64c109d8d338f990e0e7eee021 100644 (file)
--- a/arch/arm/boot/dts/tegra114.dtsi
+++ b/arch/arm/boot/dts/tegra114.dtsi
@@ -1,3 +1,5 @@
+#include <dt-bindings/gpio/tegra-gpio.h>
+
 #include "skeleton.dtsi"
 
 / {

diff --git a/arch/arm/boot/dts/tegra20-colibri-512.dtsi b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
index efd705157f6da707a300563b2a5e58ffbaf110a6..a80be142c96b19d9947c05929f53b9126d51e898 100644 (file)
--- a/arch/arm/boot/dts/tegra20-colibri-512.dtsi
+++ b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
@@ -14,7 +14,8 @@
                        pll-supply = <&hdmi_pll_reg>;
 
                        nvidia,ddc-i2c-bus = <&i2c_ddc>;
-                       nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */
+                       nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7)
+                               GPIO_ACTIVE_HIGH>;
                };
        };
 
@@ -443,21 +444,25 @@
 
        ac97: ac97 {
                status = "okay";
-               nvidia,codec-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
-               nvidia,codec-sync-gpio = <&gpio 120 0>; /* gpio PP0 */
+               nvidia,codec-reset-gpio = <&gpio TEGRA_GPIO(V, 0)
+                       GPIO_ACTIVE_HIGH>;
+               nvidia,codec-sync-gpio = <&gpio TEGRA_GPIO(P, 0)
+                       GPIO_ACTIVE_HIGH>;
        };
 
        usb@c5004000 {
                status = "okay";
-               nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
+               nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
+                       GPIO_ACTIVE_LOW>;
        };
 
        usb-phy@c5004000 {
-               nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
+               nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
+                       GPIO_ACTIVE_LOW>;
        };
 
        sdhci@c8000600 {
-               cd-gpios = <&gpio 23 1>; /* gpio PC7 */
+               cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>;
        };
 
        clocks {
@@ -514,7 +519,7 @@
                        enable-active-high;
                        regulator-boot-on;
                        regulator-always-on;
-                       gpio = <&gpio 217 0>;
+                       gpio = <&gpio TEGRA_GPIO(BB, 1) GPIO_ACTIVE_HIGH>;
                };
        };
 };

diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index 0f788f9587cd1465eb833799f796123b3a444089..8fac82b454fdc8152553b18726f13af192f89c4f 100644 (file)
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -18,7 +18,8 @@
                        pll-supply = <&hdmi_pll_reg>;
 
                        nvidia,ddc-i2c-bus = <&hdmi_ddc>;
-                       nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */
+                       nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7)
+                               GPIO_ACTIVE_HIGH>;
                };
        };
 
@@ -262,7 +263,7 @@
                        compatible = "wlf,wm8903";
                        reg = <0x1a>;
                        interrupt-parent = <&gpio>;
-                       interrupts = <187 0x04>;
+                       interrupts = <TEGRA_GPIO(X, 3) 0x04>;
 
                        gpio-controller;
                        #gpio-cells = <2>;
@@ -434,12 +435,14 @@
 
        usb@c5004000 {
                status = "okay";
-               nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
+               nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
+                       GPIO_ACTIVE_LOW>;
        };
 
        usb-phy@c5004000 {
                status = "okay";
-               nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
+               nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
+                       GPIO_ACTIVE_LOW>;
        };
 
        usb@c5008000 {
@@ -452,17 +455,17 @@
 
        sdhci@c8000200 {
                status = "okay";
-               cd-gpios = <&gpio 69 1>; /* gpio PI5 */
-               wp-gpios = <&gpio 57 0>; /* gpio PH1 */
-               power-gpios = <&gpio 155 0>; /* gpio PT3 */
+               cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
+               wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
+               power-gpios = <&gpio TEGRA_GPIO(T, 3) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
        };
 
        sdhci@c8000600 {
                status = "okay";
-               cd-gpios = <&gpio 58 1>; /* gpio PH2 */
-               wp-gpios = <&gpio 59 0>; /* gpio PH3 */
-               power-gpios = <&gpio 70 0>; /* gpio PI6 */
+               cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;
+               wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
+               power-gpios = <&gpio TEGRA_GPIO(I, 6) GPIO_ACTIVE_HIGH>;
                bus-width = <8>;
        };
 
@@ -484,7 +487,7 @@
 
                power {
                        label = "Power";
-                       gpios = <&gpio 170 1>; /* gpio PV2, active low */
+                       gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
                        linux,code = <116>; /* KEY_POWER */
                        gpio-key,wakeup;
                };
@@ -627,7 +630,7 @@
                        regulator-name = "vdd_1v5";
                        regulator-min-microvolt = <1500000>;
                        regulator-max-microvolt = <1500000>;
-                       gpio = <&pmic 0 0>;
+                       gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
                };
 
                regulator@2 {
@@ -636,7 +639,7 @@
                        regulator-name = "vdd_1v2";
                        regulator-min-microvolt = <1200000>;
                        regulator-max-microvolt = <1200000>;
-                       gpio = <&pmic 1 0>;
+                       gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
                        enable-active-high;
                };
 
@@ -646,7 +649,7 @@
                        regulator-name = "vdd_1v05";
                        regulator-min-microvolt = <1050000>;
                        regulator-max-microvolt = <1050000>;
-                       gpio = <&pmic 2 0>;
+                       gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
                        enable-active-high;
                        /* Hack until board-harmony-pcie.c is removed */
                        status = "disabled";
@@ -658,7 +661,7 @@
                        regulator-name = "vdd_pnl";
                        regulator-min-microvolt = <2800000>;
                        regulator-max-microvolt = <2800000>;
-                       gpio = <&gpio 22 0>; /* gpio PC6 */
+                       gpio = <&gpio TEGRA_GPIO(C, 6) GPIO_ACTIVE_HIGH>;
                        enable-active-high;
                };
 
@@ -668,7 +671,7 @@
                        regulator-name = "vdd_bl";
                        regulator-min-microvolt = <2800000>;
                        regulator-max-microvolt = <2800000>;
-                       gpio = <&gpio 176 0>; /* gpio PW0 */
+                       gpio = <&gpio TEGRA_GPIO(W, 0) GPIO_ACTIVE_HIGH>;
                        enable-active-high;
                };
        };
@@ -691,10 +694,13 @@
                nvidia,i2s-controller = <&tegra_i2s1>;
                nvidia,audio-codec = <&wm8903>;
 
-               nvidia,spkr-en-gpios = <&wm8903 2 0>;
-               nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
-               nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */
-               nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
+               nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
+               nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2)
+                       GPIO_ACTIVE_HIGH>;
+               nvidia,int-mic-en-gpios = <&gpio TEGRA_GPIO(X, 0)
+                       GPIO_ACTIVE_HIGH>;
+               nvidia,ext-mic-en-gpios = <&gpio TEGRA_GPIO(X, 1)
+                       GPIO_ACTIVE_HIGH>;
 
                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
                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 9de10a2e78b82aa77d7bc3c216fae8256b798b22..f2222bd74eab157f94ffcf884d9265765766f7d6 100644 (file)
--- a/arch/arm/boot/dts/tegra20-iris-512.dts
+++ b/arch/arm/boot/dts/tegra20-iris-512.dts
@@ -80,7 +80,7 @@
                        regulator-max-microvolt = <5000000>;
                        regulator-boot-on;
                        regulator-always-on;
-                       gpio = <&gpio 178 0>;
+                       gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>;
                };
 
                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 d7e32fa5d905143c6f8ac1bc9feb96e20411b392..3adfbfe634f502404ec8b2846323229a3d2b2d03 100644 (file)
--- a/arch/arm/boot/dts/tegra20-medcom-wide.dts
+++ b/arch/arm/boot/dts/tegra20-medcom-wide.dts
@@ -15,7 +15,7 @@
                        compatible = "wlf,wm8903";
                        reg = <0x1a>;
                        interrupt-parent = <&gpio>;
-                       interrupts = <187 0x04>;
+                       interrupts = <TEGRA_GPIO(X, 3) 0x04>;
 
                        gpio-controller;
                        #gpio-cells = <2>;
@@ -56,8 +56,8 @@
                nvidia,i2s-controller = <&tegra_i2s1>;
                nvidia,audio-codec = <&wm8903>;
 
-               nvidia,spkr-en-gpios = <&wm8903 2 0>;
-               nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
+               nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
+               nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>;
 
                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
                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 cbbd85a60bb9fdf162126f4faf67fd344540b194..0f267d861e75c94ff489625357a343be8ebec6f5 100644 (file)
--- a/arch/arm/boot/dts/tegra20-paz00.dts
+++ b/arch/arm/boot/dts/tegra20-paz00.dts
@@ -18,7 +18,8 @@
                        pll-supply = <&hdmi_pll_reg>;
 
                        nvidia,ddc-i2c-bus = <&hdmi_ddc>;
-                       nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */
+                       nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7)
+                               GPIO_ACTIVE_HIGH>;
                };
        };
 
@@ -274,7 +275,7 @@
                #address-cells = <1>;
                #size-cells = <0>;
                clock-frequency = <80000>;
-               request-gpios = <&gpio 170 0>; /* gpio PV2 */
+               request-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
                slave-addr = <138>;
                clocks = <&tegra_car 67>, <&tegra_car 124>;
                clock-names = "div-clk", "fast-clk";
@@ -433,12 +434,14 @@
 
        usb@c5004000 {
                status = "okay";
-               nvidia,phy-reset-gpio = <&gpio 168 1>; /* gpio PV0, active low */
+               nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 0)
+                       GPIO_ACTIVE_LOW>;
        };
 
        usb-phy@c5004000 {
                status = "okay";
-               nvidia,phy-reset-gpio = <&gpio 168 1>; /* gpio PV0, active low */
+               nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 0)
+                       GPIO_ACTIVE_LOW>;
        };
 
        usb@c5008000 {
@@ -451,9 +454,9 @@
 
        sdhci@c8000000 {
                status = "okay";
-               cd-gpios = <&gpio 173 1>; /* gpio PV5 */
-               wp-gpios = <&gpio 57 0>;  /* gpio PH1 */
-               power-gpios = <&gpio 169 0>; /* gpio PV1 */
+               cd-gpios = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_LOW>;
+               wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
+               power-gpios = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
        };
 
@@ -481,7 +484,7 @@
 
                power {
                        label = "Power";
-                       gpios = <&gpio 79 1>; /* gpio PJ7, active low */
+                       gpios = <&gpio TEGRA_GPIO(J, 7) GPIO_ACTIVE_LOW>;
                        linux,code = <116>; /* KEY_POWER */
                        gpio-key,wakeup;
                };
@@ -492,7 +495,7 @@
 
                wifi {
                        label = "wifi-led";
-                       gpios = <&gpio 24 0>; /* gpio PD0 */
+                       gpios = <&gpio TEGRA_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "rfkill0";
                };
        };
@@ -529,7 +532,8 @@
 
                nvidia,audio-codec = <&alc5632>;
                nvidia,i2s-controller = <&tegra_i2s1>;
-               nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
+               nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2)
+                       GPIO_ACTIVE_HIGH>;
 
                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
                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 508e56a2e1f152917769d31d664ff8b905c70861..3d8e69be83a5d20437bf663a5629240123de052e 100644 (file)
--- a/arch/arm/boot/dts/tegra20-plutux.dts
+++ b/arch/arm/boot/dts/tegra20-plutux.dts
@@ -17,7 +17,7 @@
                        compatible = "wlf,wm8903";
                        reg = <0x1a>;
                        interrupt-parent = <&gpio>;
-                       interrupts = <187 0x04>;
+                       interrupts = <TEGRA_GPIO(X, 3) 0x04>;
 
                        gpio-controller;
                        #gpio-cells = <2>;
@@ -50,8 +50,8 @@
                nvidia,i2s-controller = <&tegra_i2s1>;
                nvidia,audio-codec = <&wm8903>;
 
-               nvidia,spkr-en-gpios = <&wm8903 2 0>;
-               nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
+               nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
+               nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>;
 
                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
                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 0855b5e581b9b85ec321b53c0023b1f8cd1c457c..3952757a48e9b6d0d8b3e942fe3464ccd7ea9f93 100644 (file)
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -18,7 +18,8 @@
                        pll-supply = <&hdmi_pll_reg>;
 
                        nvidia,ddc-i2c-bus = <&hdmi_ddc>;
-                       nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */
+                       nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7)
+                               GPIO_ACTIVE_HIGH>;
                };
        };
 
@@ -313,7 +314,7 @@
                        compatible = "wlf,wm8903";
                        reg = <0x1a>;
                        interrupt-parent = <&gpio>;
-                       interrupts = <187 0x04>;
+                       interrupts = <TEGRA_GPIO(X, 3) 0x04>;
 
                        gpio-controller;
                        #gpio-cells = <2>;
@@ -328,14 +329,14 @@
                        compatible = "isil,isl29018";
                        reg = <0x44>;
                        interrupt-parent = <&gpio>;
-                       interrupts = <202 0x04>; /* GPIO PZ2 */
+                       interrupts = <TEGRA_GPIO(Z, 2) 0x04>;
                };
 
                gyrometer@68 {
                        compatible = "invn,mpu3050";
                        reg = <0x68>;
                        interrupt-parent = <&gpio>;
-                       interrupts = <204 0x04>; /* gpio PZ4 */
+                       interrupts = <TEGRA_GPIO(Z, 4) 0x04>;
                };
        };
 
@@ -511,7 +512,7 @@
                        compatible = "ak,ak8975";
                        reg = <0xc>;
                        interrupt-parent = <&gpio>;
-                       interrupts = <109 0x04>; /* gpio PN5 */
+                       interrupts = <TEGRA_GPIO(N, 5) 0x04>;
                };
        };
 
@@ -565,7 +566,7 @@
 
        usb@c5000000 {
                status = "okay";
-               nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */
+               nvidia,vbus-gpio = <&gpio TEGRA_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
                dr_mode = "otg";
        };
 
@@ -577,12 +578,14 @@
 
        usb@c5004000 {
                status = "okay";
-               nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
+               nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
+                       GPIO_ACTIVE_LOW>;
        };
 
        usb-phy@c5004000 {
                status = "okay";
-               nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
+               nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
+                       GPIO_ACTIVE_LOW>;
        };
 
        usb@c5008000 {
@@ -595,16 +598,16 @@
 
        sdhci@c8000000 {
                status = "okay";
-               power-gpios = <&gpio 86 0>; /* gpio PK6 */
+               power-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
                keep-power-in-suspend;
        };
 
        sdhci@c8000400 {
                status = "okay";
-               cd-gpios = <&gpio 69 1>; /* gpio PI5 */
-               wp-gpios = <&gpio 57 0>; /* gpio PH1 */
-               power-gpios = <&gpio 70 0>; /* gpio PI6 */
+               cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
+               wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
+               power-gpios = <&gpio TEGRA_GPIO(I, 6) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
        };
 
@@ -632,14 +635,14 @@
 
                power {
                        label = "Power";
-                       gpios = <&gpio 170 1>; /* gpio PV2, active low */
+                       gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
                        linux,code = <116>; /* KEY_POWER */
                        gpio-key,wakeup;
                };
 
                lid {
                        label = "Lid";
-                       gpios = <&gpio 23 0>; /* gpio PC7 */
+                       gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_HIGH>;
                        linux,input-type = <5>; /* EV_SW */
                        linux,code = <0>; /* SW_LID */
                        debounce-interval = <1>;
@@ -806,7 +809,7 @@
                        regulator-name = "vdd_1v5";
                        regulator-min-microvolt = <1500000>;
                        regulator-max-microvolt = <1500000>;
-                       gpio = <&pmic 0 0>;
+                       gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
                };
 
                regulator@2 {
@@ -815,7 +818,7 @@
                        regulator-name = "vdd_1v2";
                        regulator-min-microvolt = <1200000>;
                        regulator-max-microvolt = <1200000>;
-                       gpio = <&pmic 1 0>;
+                       gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
                        enable-active-high;
                };
 
@@ -847,8 +850,8 @@
                nvidia,i2s-controller = <&tegra_i2s1>;
                nvidia,audio-codec = <&wm8903>;
 
-               nvidia,spkr-en-gpios = <&wm8903 2 0>;
-               nvidia,hp-det-gpios = <&gpio 185 0>; /* gpio PX1 */
+               nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
+               nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(X, 1) GPIO_ACTIVE_HIGH>;
 
                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
                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 4e18fdf3d6356315e129652e3b5abea72c6af46e..321cb20b045ffdca07877ab57494d1fca1724303 100644 (file)
--- a/arch/arm/boot/dts/tegra20-tamonten.dtsi
+++ b/arch/arm/boot/dts/tegra20-tamonten.dtsi
@@ -14,7 +14,8 @@
                        pll-supply = <&hdmi_pll_reg>;
 
                        nvidia,ddc-i2c-bus = <&hdmi_ddc>;
-                       nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */
+                       nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7)
+                               GPIO_ACTIVE_HIGH>;
                };
        };
 
@@ -475,8 +476,8 @@
        };
 
        sdhci@c8000600 {
-               cd-gpios = <&gpio 58 1>; /* gpio PH2 */
-               wp-gpios = <&gpio 59 0>; /* gpio PH3 */
+               cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;
+               wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
                status = "okay";
        };

diff --git a/arch/arm/boot/dts/tegra20-tec.dts b/arch/arm/boot/dts/tegra20-tec.dts
index 9a2a6a45aedd09282941f0e8fdaa65f3c308dd94..db58bb7ff9e59c532119264326bad11dce5955a8 100644 (file)
--- a/arch/arm/boot/dts/tegra20-tec.dts
+++ b/arch/arm/boot/dts/tegra20-tec.dts
@@ -17,7 +17,7 @@
                        compatible = "wlf,wm8903";
                        reg = <0x1a>;
                        interrupt-parent = <&gpio>;
-                       interrupts = <187 0x04>;
+                       interrupts = <TEGRA_GPIO(X, 3) 0x04>;
 
                        gpio-controller;
                        #gpio-cells = <2>;
@@ -50,8 +50,9 @@
                nvidia,i2s-controller = <&tegra_i2s1>;
                nvidia,audio-codec = <&wm8903>;
 
-               nvidia,spkr-en-gpios = <&wm8903 2 0>;
-               nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
+               nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
+               nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2)
+                       GPIO_ACTIVE_HIGH>;
 
                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
                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 d2966b2788c4a332420eecc6ccbaab695940515a..4257ab44fe84f13fbd4395c2d0566a2fea0638fc 100644 (file)
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -18,7 +18,8 @@
                        pll-supply = <&hdmi_pll_reg>;
 
                        nvidia,ddc-i2c-bus = <&hdmi_ddc>;
-                       nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */
+                       nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7)
+                               GPIO_ACTIVE_HIGH>;
                };
        };
 
@@ -311,7 +312,7 @@
 
        usb@c5000000 {
                status = "okay";
-               nvidia,vbus-gpio = <&gpio 170 0>; /* gpio PV2 */
+               nvidia,vbus-gpio = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
        };
 
        usb-phy@c5000000 {
@@ -321,12 +322,14 @@
 
        usb@c5004000 {
                status = "okay";
-               nvidia,phy-reset-gpio = <&gpio 168 1>; /* gpio PV0, active low */
+               nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 0)
+                       GPIO_ACTIVE_LOW>;
        };
 
        usb-phy@c5004000 {
                status = "okay";
-               nvidia,phy-reset-gpio = <&gpio 168 1>; /* gpio PV0, active low */
+               nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 0)
+                       GPIO_ACTIVE_LOW>;
        };
 
        usb@c5008000 {
@@ -344,8 +347,8 @@
 
        sdhci@c8000600 {
                status = "okay";
-               cd-gpios = <&gpio 121 1>; /* gpio PP1 */
-               wp-gpios = <&gpio 122 0>; /* gpio PP2 */
+               cd-gpios = <&gpio TEGRA_GPIO(P, 1) GPIO_ACTIVE_LOW>;
+               wp-gpios = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
        };
 
@@ -367,7 +370,7 @@
 
                power {
                        label = "Power";
-                       gpios = <&gpio 190 1>; /* gpio PX6, active low */
+                       gpios = <&gpio TEGRA_GPIO(X, 6) GPIO_ACTIVE_LOW>;
                        linux,code = <116>; /* KEY_POWER */
                        gpio-key,wakeup;
                };
@@ -375,7 +378,7 @@
 
        poweroff {
                compatible = "gpio-poweroff";
-               gpios = <&gpio 191 1>; /* gpio PX7, active low */
+               gpios = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_LOW>;
        };
 
        regulators {

diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts
index 51feeb4fb5817c3baed59e3045de52935688a263..ff8817b86c1a9a18741a09a3671bd41b72f3a3f7 100644 (file)
--- a/arch/arm/boot/dts/tegra20-ventana.dts
+++ b/arch/arm/boot/dts/tegra20-ventana.dts
@@ -18,7 +18,8 @@
                        pll-supply = <&hdmi_pll_reg>;
 
                        nvidia,ddc-i2c-bus = <&hdmi_ddc>;
-                       nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */
+                       nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7)
+                               GPIO_ACTIVE_HIGH>;
                };
        };
 
@@ -310,7 +311,7 @@
                        compatible = "wlf,wm8903";
                        reg = <0x1a>;
                        interrupt-parent = <&gpio>;
-                       interrupts = <187 0x04>;
+                       interrupts = <TEGRA_GPIO(X, 3) 0x04>;
 
                        gpio-controller;
                        #gpio-cells = <2>;
@@ -325,7 +326,7 @@
                        compatible = "isil,isl29018";
                        reg = <0x44>;
                        interrupt-parent = <&gpio>;
-                       interrupts = <202 0x04>; /*gpio PZ2 */
+                       interrupts = <TEGRA_GPIO(Z, 2) 0x04>;
                };
        };
 
@@ -511,12 +512,14 @@
 
        usb@c5004000 {
                status = "okay";
-               nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
+               nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
+                       GPIO_ACTIVE_LOW>;
        };
 
        usb-phy@c5004000 {
                status = "okay";
-               nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
+               nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
+                       GPIO_ACTIVE_LOW>;
        };
 
        usb@c5008000 {
@@ -529,16 +532,16 @@
 
        sdhci@c8000000 {
                status = "okay";
-               power-gpios = <&gpio 86 0>; /* gpio PK6 */
+               power-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
                keep-power-in-suspend;
        };
 
        sdhci@c8000400 {
                status = "okay";
-               cd-gpios = <&gpio 69 1>; /* gpio PI5 */
-               wp-gpios = <&gpio 57 0>; /* gpio PH1 */
-               power-gpios = <&gpio 70 0>; /* gpio PI6 */
+               cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
+               wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
+               power-gpios = <&gpio TEGRA_GPIO(I, 6) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
        };
 
@@ -566,7 +569,7 @@
 
                power {
                        label = "Power";
-                       gpios = <&gpio 170 1>; /* gpio PV2, active low */
+                       gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
                        linux,code = <116>; /* KEY_POWER */
                        gpio-key,wakeup;
                };
@@ -592,7 +595,7 @@
                        regulator-name = "vdd_1v5";
                        regulator-min-microvolt = <1500000>;
                        regulator-max-microvolt = <1500000>;
-                       gpio = <&pmic 0 0>;
+                       gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
                };
 
                regulator@2 {
@@ -601,7 +604,7 @@
                        regulator-name = "vdd_1v2";
                        regulator-min-microvolt = <1200000>;
                        regulator-max-microvolt = <1200000>;
-                       gpio = <&pmic 1 0>;
+                       gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
                        enable-active-high;
                };
 
@@ -611,7 +614,7 @@
                        regulator-name = "vdd_pnl";
                        regulator-min-microvolt = <2800000>;
                        regulator-max-microvolt = <2800000>;
-                       gpio = <&gpio 22 0>; /* gpio PC6 */
+                       gpio = <&gpio TEGRA_GPIO(C, 6) GPIO_ACTIVE_HIGH>;
                        enable-active-high;
                };
 
@@ -621,7 +624,7 @@
                        regulator-name = "vdd_bl";
                        regulator-min-microvolt = <2800000>;
                        regulator-max-microvolt = <2800000>;
-                       gpio = <&gpio 176 0>; /* gpio PW0 */
+                       gpio = <&gpio TEGRA_GPIO(W, 0) GPIO_ACTIVE_HIGH>;
                        enable-active-high;
                };
        };
@@ -644,10 +647,12 @@
                nvidia,i2s-controller = <&tegra_i2s1>;
                nvidia,audio-codec = <&wm8903>;
 
-               nvidia,spkr-en-gpios = <&wm8903 2 0>;
-               nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
-               nvidia,int-mic-en-gpios = <&gpio 184 0>; /* gpio PX0 */
-               nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
+               nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
+               nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>;
+               nvidia,int-mic-en-gpios = <&gpio TEGRA_GPIO(X, 0)
+                       GPIO_ACTIVE_HIGH>;
+               nvidia,ext-mic-en-gpios = <&gpio TEGRA_GPIO(X, 1)
+                       GPIO_ACTIVE_HIGH>;
 
                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
                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 1748be5459054cd525825fa20be427caac4f7df3..9a773bb9da7103de611837a5cb9e77d684cb7451 100644 (file)
--- a/arch/arm/boot/dts/tegra20-whistler.dts
+++ b/arch/arm/boot/dts/tegra20-whistler.dts
@@ -18,7 +18,8 @@
                        pll-supply = <&hdmi_pll_reg>;
 
                        nvidia,ddc-i2c-bus = <&hdmi_ddc>;
-                       nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */
+                       nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7)
+                               GPIO_ACTIVE_HIGH>;
                };
        };
 
@@ -508,7 +509,7 @@
 
        usb@c5000000 {
                status = "okay";
-               nvidia,vbus-gpio = <&tca6416 0 0>; /* GPIO_PMU0 */
+               nvidia,vbus-gpio = <&tca6416 0 GPIO_ACTIVE_HIGH>;
        };
 
        usb-phy@c5000000 {
@@ -518,7 +519,7 @@
 
        usb@c5008000 {
                status = "okay";
-               nvidia,vbus-gpio = <&tca6416 1 0>; /* GPIO_PMU1 */
+               nvidia,vbus-gpio = <&tca6416 1 GPIO_ACTIVE_HIGH>;
        };
 
        usb-phy@c5008000 {
@@ -528,8 +529,8 @@
 
        sdhci@c8000400 {
                status = "okay";
-               cd-gpios = <&gpio 69 1>; /* gpio PI5 */
-               wp-gpios = <&gpio 173 0>; /* gpio PV5 */
+               cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
+               wp-gpios = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_HIGH>;
                bus-width = <8>;
        };
 

diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index cde2f808b6c0ae5a636e12ca7a0bbc15969b813e..673f3869c9cc04579a6dd51bd2425c521c7c4656 100644 (file)
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -1,3 +1,5 @@
+#include <dt-bindings/gpio/tegra-gpio.h>
+
 #include "skeleton.dtsi"
 
 / {

diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts
index e86c2805dcb6d1d46593f6db29efb2c14c453e8f..40b0bd700b419de0c27b5a987425cb0a8c778f3d 100644 (file)
--- a/arch/arm/boot/dts/tegra30-beaver.dts
+++ b/arch/arm/boot/dts/tegra30-beaver.dts
@@ -264,9 +264,9 @@
 
        sdhci@78000000 {
                status = "okay";
-               cd-gpios = <&gpio 69 1>; /* gpio PI5 */
-               wp-gpios = <&gpio 155 0>; /* gpio PT3 */
-               power-gpios = <&gpio 31 0>; /* gpio PD7 */
+               cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
+               wp-gpios = <&gpio TEGRA_GPIO(T, 3) GPIO_ACTIVE_HIGH>;
+               power-gpios = <&gpio TEGRA_GPIO(D, 7) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
        };
 
@@ -312,7 +312,7 @@
                        regulator-boot-on;
                        regulator-always-on;
                        enable-active-high;
-                       gpio = <&pmic 0 0>; /* PMIC TPS65911 GPIO0 */
+                       gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
                };
 
                ddr_reg: regulator@2 {
@@ -324,7 +324,7 @@
                        regulator-always-on;
                        regulator-boot-on;
                        enable-active-high;
-                       gpio = <&pmic 7 0>; /* PMIC TPS65911 GPIO7 */
+                       gpio = <&pmic 7 GPIO_ACTIVE_HIGH>;
                        vin-supply = <&vdd_5v_in_reg>;
                };
 
@@ -337,7 +337,7 @@
                        regulator-always-on;
                        regulator-boot-on;
                        enable-active-high;
-                       gpio = <&gpio 30 0>; /* gpio PD6 */
+                       gpio = <&gpio TEGRA_GPIO(D, 6) GPIO_ACTIVE_HIGH>;
                        vin-supply = <&vdd_5v_in_reg>;
                };
 
@@ -348,7 +348,7 @@
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
                        enable-active-high;
-                       gpio = <&gpio 68 0>; /* GPIO PI4 */
+                       gpio = <&gpio TEGRA_GPIO(I, 4) GPIO_ACTIVE_HIGH>;
                        gpio-open-drain;
                        vin-supply = <&vdd_5v_in_reg>;
                };
@@ -360,7 +360,7 @@
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
                        enable-active-high;
-                       gpio = <&gpio 63 0>; /* GPIO PH7 */
+                       gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_HIGH>;
                        gpio-open-drain;
                        vin-supply = <&vdd_5v_in_reg>;
                };
@@ -374,7 +374,7 @@
                        regulator-always-on;
                        regulator-boot-on;
                        enable-active-high;
-                       gpio = <&pmic 6 0>; /* PMIC TPS65911 GPIO6 */
+                       gpio = <&pmic 6 GPIO_ACTIVE_HIGH>;
                        vin-supply = <&vdd_5v_in_reg>;
                };
 
@@ -387,7 +387,7 @@
                        regulator-always-on;
                        regulator-boot-on;
                        enable-active-high;
-                       gpio = <&gpio 95 0>; /* gpio PL7 */
+                       gpio = <&gpio TEGRA_GPIO(L, 7) GPIO_ACTIVE_HIGH>;
                        vin-supply = <&sys_3v3_reg>;
                };
        };
@@ -397,11 +397,11 @@
 
                gpled1 {
                        label = "LED1"; /* CR5A1 (blue) */
-                       gpios = <&gpio 89 0>; /* gpio PL1 */
+                       gpios = <&gpio TEGRA_GPIO(L, 1) GPIO_ACTIVE_HIGH>;
                };
                gpled2 {
                        label = "LED2"; /* CR4A2 (green) */
-                       gpios = <&gpio 88 0>; /* gpio PL0 */
+                       gpios = <&gpio TEGRA_GPIO(L, 0) GPIO_ACTIVE_HIGH>;
                };
        };
 };

diff --git a/arch/arm/boot/dts/tegra30-cardhu-a02.dts b/arch/arm/boot/dts/tegra30-cardhu-a02.dts
index 3934b0f37f6b1388bfdd52cf821250403ae5f778..1082c5ed90d18ecdd413cc43c5874cb7c27013ab 100644 (file)
--- a/arch/arm/boot/dts/tegra30-cardhu-a02.dts
+++ b/arch/arm/boot/dts/tegra30-cardhu-a02.dts
@@ -22,7 +22,7 @@
                        regulator-always-on;
                        regulator-boot-on;
                        enable-active-high;
-                       gpio = <&pmic 6 0>;
+                       gpio = <&pmic 6 GPIO_ACTIVE_HIGH>;
                };
 
                sys_3v3_reg: regulator@101 {
@@ -34,7 +34,7 @@
                        regulator-always-on;
                        regulator-boot-on;
                        enable-active-high;
-                       gpio = <&pmic 7 0>;
+                       gpio = <&pmic 7 GPIO_ACTIVE_HIGH>;
                };
 
                usb1_vbus_reg: regulator@102 {
@@ -44,7 +44,7 @@
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
                        enable-active-high;
-                       gpio = <&gpio 68 0>; /* GPIO PI4 */
+                       gpio = <&gpio TEGRA_GPIO(I, 4) GPIO_ACTIVE_HIGH>;
                        gpio-open-drain;
                        vin-supply = <&vdd_5v0_reg>;
                };
@@ -56,7 +56,7 @@
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
                        enable-active-high;
-                       gpio = <&gpio 63 0>; /* GPIO PH7 */
+                       gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_HIGH>;
                        gpio-open-drain;
                        vin-supply = <&vdd_5v0_reg>;
                };
@@ -68,7 +68,7 @@
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
                        enable-active-high;
-                       gpio = <&pmic 2 0>;
+                       gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
                };
 
                vdd_bl_reg: regulator@105 {
@@ -80,13 +80,13 @@
                        regulator-always-on;
                        regulator-boot-on;
                        enable-active-high;
-                       gpio = <&gpio 83 0>; /* GPIO PK3 */
+                       gpio = <&gpio TEGRA_GPIO(K, 3) GPIO_ACTIVE_HIGH>;
                };
        };
 
        sdhci@78000400 {
                status = "okay";
-               power-gpios = <&gpio 28 0>; /* gpio PD4 */
+               power-gpios = <&gpio TEGRA_GPIO(D, 4) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
                keep-power-in-suspend;
        };

diff --git a/arch/arm/boot/dts/tegra30-cardhu-a04.dts b/arch/arm/boot/dts/tegra30-cardhu-a04.dts
index af3ff7a46ee1aace3456600da3472f2f6009e535..bf012bddaafba6691e3aefe99437e5a70b870fe2 100644 (file)
--- a/arch/arm/boot/dts/tegra30-cardhu-a04.dts
+++ b/arch/arm/boot/dts/tegra30-cardhu-a04.dts
@@ -22,7 +22,7 @@
                        regulator-always-on;
                        regulator-boot-on;
                        enable-active-high;
-                       gpio = <&pmic 7 0>;
+                       gpio = <&pmic 7 GPIO_ACTIVE_HIGH>;
                };
 
                sys_3v3_reg: regulator@101 {
@@ -34,7 +34,7 @@
                        regulator-always-on;
                        regulator-boot-on;
                        enable-active-high;
-                       gpio = <&pmic 6 0>;
+                       gpio = <&pmic 6 GPIO_ACTIVE_HIGH>;
                };
 
                usb1_vbus_reg: regulator@102 {
@@ -44,7 +44,7 @@
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
                        enable-active-high;
-                       gpio = <&gpio 238 0>; /* GPIO PDD6 */
+                       gpio = <&gpio TEGRA_GPIO(DD, 6) GPIO_ACTIVE_HIGH>;
                        gpio-open-drain;
                        vin-supply = <&vdd_5v0_reg>;
                };
@@ -56,7 +56,7 @@
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
                        enable-active-high;
-                       gpio = <&gpio 236 0>; /* GPIO PDD4 */
+                       gpio = <&gpio TEGRA_GPIO(DD, 4) GPIO_ACTIVE_HIGH>;
                        gpio-open-drain;
                        vin-supply = <&vdd_5v0_reg>;
                };
@@ -68,7 +68,7 @@
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
                        enable-active-high;
-                       gpio = <&pmic 8 0>;
+                       gpio = <&pmic 8 GPIO_ACTIVE_HIGH>;
                };
 
                vdd_bl_reg: regulator@105 {
@@ -80,7 +80,7 @@
                        regulator-always-on;
                        regulator-boot-on;
                        enable-active-high;
-                       gpio = <&gpio 234 0>; /* GPIO PDD2 */
+                       gpio = <&gpio TEGRA_GPIO(DD, 2) GPIO_ACTIVE_HIGH>;
                };
 
                vdd_bl2_reg: regulator@106 {
@@ -92,13 +92,13 @@
                        regulator-always-on;
                        regulator-boot-on;
                        enable-active-high;
-                       gpio = <&gpio 232 0>; /* GPIO PDD0 */
+                       gpio = <&gpio TEGRA_GPIO(DD, 0) GPIO_ACTIVE_HIGH>;
                };
        };
 
        sdhci@78000400 {
                status = "okay";
-               power-gpios = <&gpio 27 0>; /* gpio PD3 */
+               power-gpios = <&gpio TEGRA_GPIO(D, 3) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
                keep-power-in-suspend;
        };

diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index e54eed2d610eef0007befdad1e1ab3a3312a5250..c177fd9fe6d84a019eb82afb984dec87bb6f4284 100644 (file)
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -146,7 +146,7 @@
                        compatible = "isil,isl29028";
                        reg = <0x44>;
                        interrupt-parent = <&gpio>;
-                       interrupts = <88 0x04>; /*gpio PL0 */
+                       interrupts = <TEGRA_GPIO(L, 0) 0x04>;
                };
        };
 
@@ -163,7 +163,7 @@
                        compatible = "wlf,wm8903";
                        reg = <0x1a>;
                        interrupt-parent = <&gpio>;
-                       interrupts = <179 0x04>; /* gpio PW3 */
+                       interrupts = <TEGRA_GPIO(W, 3) 0x04>;
 
                        gpio-controller;
                        #gpio-cells = <2>;
@@ -318,9 +318,9 @@
 
        sdhci@78000000 {
                status = "okay";
-               cd-gpios = <&gpio 69 1>; /* gpio PI5 */
-               wp-gpios = <&gpio 155 0>; /* gpio PT3 */
-               power-gpios = <&gpio 31 0>; /* gpio PD7 */
+               cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
+               wp-gpios = <&gpio TEGRA_GPIO(T, 3) GPIO_ACTIVE_HIGH>;
+               power-gpios = <&gpio TEGRA_GPIO(D, 7) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
        };
 
@@ -364,7 +364,7 @@
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                        enable-active-high;
-                       gpio = <&gpio 220 0>; /* gpio PBB4 */
+                       gpio = <&gpio TEGRA_GPIO(BB, 4) GPIO_ACTIVE_HIGH>;
                        vin-supply = <&vio_reg>;
                };
 
@@ -377,7 +377,7 @@
                        regulator-boot-on;
                        regulator-always-on;
                        enable-active-high;
-                       gpio = <&pmic 0 0>; /* PMIC TPS65911 GPIO0 */
+                       gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
                };
 
                emmc_3v3_reg: regulator@3 {
@@ -389,7 +389,7 @@
                        regulator-always-on;
                        regulator-boot-on;
                        enable-active-high;
-                       gpio = <&gpio 25 0>; /* gpio PD1 */
+                       gpio = <&gpio TEGRA_GPIO(D, 1) GPIO_ACTIVE_HIGH>;
                        vin-supply = <&sys_3v3_reg>;
                };
 
@@ -400,7 +400,7 @@
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
                        enable-active-high;
-                       gpio = <&gpio 30 0>; /* gpio PD6 */
+                       gpio = <&gpio TEGRA_GPIO(D, 6) GPIO_ACTIVE_HIGH>;
                };
 
                pex_hvdd_3v3_reg: regulator@5 {
@@ -410,7 +410,7 @@
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
                        enable-active-high;
-                       gpio = <&gpio 95 0>; /* gpio PL7 */
+                       gpio = <&gpio TEGRA_GPIO(L, 7) GPIO_ACTIVE_HIGH>;
                        vin-supply = <&sys_3v3_reg>;
                };
 
@@ -421,7 +421,7 @@
                        regulator-min-microvolt = <2800000>;
                        regulator-max-microvolt = <2800000>;
                        enable-active-high;
-                       gpio = <&gpio 142 0>; /* gpio PR6 */
+                       gpio = <&gpio TEGRA_GPIO(R, 6) GPIO_ACTIVE_HIGH>;
                        vin-supply = <&sys_3v3_reg>;
                };
 
@@ -432,7 +432,7 @@
                        regulator-min-microvolt = <2800000>;
                        regulator-max-microvolt = <2800000>;
                        enable-active-high;
-                       gpio = <&gpio 143 0>; /* gpio PR7 */
+                       gpio = <&gpio TEGRA_GPIO(R, 7) GPIO_ACTIVE_HIGH>;
                        vin-supply = <&sys_3v3_reg>;
                };
 
@@ -443,7 +443,7 @@
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
                        enable-active-high;
-                       gpio = <&gpio 144 0>; /* gpio PS0 */
+                       gpio = <&gpio TEGRA_GPIO(S, 0) GPIO_ACTIVE_HIGH>;
                        vin-supply = <&sys_3v3_reg>;
                };
 
@@ -456,7 +456,7 @@
                        regulator-always-on;
                        regulator-boot-on;
                        enable-active-high;
-                       gpio = <&gpio 24 0>; /* gpio PD0 */
+                       gpio = <&gpio TEGRA_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
                        vin-supply = <&sys_3v3_reg>;
                };
 
@@ -467,7 +467,7 @@
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
                        enable-active-high;
-                       gpio = <&gpio 94 0>; /* gpio PL6 */
+                       gpio = <&gpio TEGRA_GPIO(L, 6) GPIO_ACTIVE_HIGH>;
                        vin-supply = <&sys_3v3_reg>;
                };
 
@@ -480,7 +480,7 @@
                        regulator-always-on;
                        regulator-boot-on;
                        enable-active-high;
-                       gpio = <&gpio 92 0>; /* gpio PL4 */
+                       gpio = <&gpio TEGRA_GPIO(L, 4) GPIO_ACTIVE_HIGH>;
                        vin-supply = <&sys_3v3_reg>;
                };
 
@@ -491,7 +491,7 @@
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
                        enable-active-high;
-                       gpio = <&gpio 152 0>; /* GPIO PT0 */
+                       gpio = <&gpio TEGRA_GPIO(T, 0) GPIO_ACTIVE_HIGH>;
                        gpio-open-drain;
                        vin-supply = <&vdd_5v0_reg>;
                };
@@ -515,8 +515,9 @@
                nvidia,i2s-controller = <&tegra_i2s1>;
                nvidia,audio-codec = <&wm8903>;
 
-               nvidia,spkr-en-gpios = <&wm8903 2 0>;
-               nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
+               nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
+               nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2)
+                       GPIO_ACTIVE_HIGH>;
 
                clocks = <&tegra_car 184>, <&tegra_car 185>, <&tegra_car 120>;
                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 38967fde6486d09a343ef700656e203dbbe3b875..1fe8c3abc2f4574ac9af30719e91a84f7a7ad6a5 100644 (file)
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -1,3 +1,5 @@
+#include <dt-bindings/gpio/tegra-gpio.h>
+
 #include "skeleton.dtsi"
 
 / {