ARM: tegra: convert device tree files to use GPIO defines

[deliverable/linux.git] / arch / arm / boot / dts / tegra20-tec.dts

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";