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>

1 files changed, 12 insertions, 12 deletions

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 @@
 
         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>;
                 };
         };
 };