1 files changed, 22 insertions, 15 deletions

diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts
index 1c17ffaff1ad..cfd12763b1b2 100644
--- a/arch/arm/boot/dts/tegra20-paz00.dts
+++ b/arch/arm/boot/dts/tegra20-paz00.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "tegra20.dtsi"
+#include "tegra20.dtsi"
 
 / {
         model = "Toshiba AC100 / Dynabook AZ";
@@ -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>;
                 };
         };
 
@@ -270,13 +271,14 @@
         nvec {
                 compatible = "nvidia,nvec";
                 reg = <0x7000c500 0x100>;
-                interrupts = <0 92 0x04>;
+                interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
                 #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>;
+                clocks = <&tegra_car TEGRA20_CLK_I2C3>,
+                         <&tegra_car TEGRA20_CLK_PLL_P_OUT3>;
                 clock-names = "div-clk", "fast-clk";
         };
 
@@ -287,7 +289,7 @@
                 pmic: tps6586x@34 {
                         compatible = "ti,tps6586x";
                         reg = <0x34>;
-                        interrupts = <0 86 0x4>;
+                        interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
 
                         #gpio-cells = <2>;
                         gpio-controller;
@@ -433,12 +435,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 +455,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 +485,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 +496,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,9 +533,12 @@
 
                 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>;
+                clocks = <&tegra_car TEGRA20_CLK_PLL_A>,
+                         <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
+                         <&tegra_car TEGRA20_CLK_CDEV1>;
                 clock-names = "pll_a", "pll_a_out0", "mclk";
         };
 };