Merge git://git.denx.de/u-boot-usb

[oweals/u-boot.git] / arch / arm / dts / tegra20-colibri_t20_iris.dts

diff --git a/arch/arm/dts/tegra20-colibri_t20_iris.dts b/arch/arm/dts/tegra20-colibri_t20_iris.dts
index c0e54af8868ecf7e754d9cf7da80abab797445a1..3131b9201b7029f012c3e4f80df83663c4697d94 100644 (file)
--- a/arch/arm/dts/tegra20-colibri_t20_iris.dts
+++ b/arch/arm/dts/tegra20-colibri_t20_iris.dts
@@ -6,6 +6,10 @@
        model = "Toradex Colibri T20";
        compatible = "toradex,t20", "nvidia,tegra20";
 
+       chosen {
+               stdout-path = &uarta;
+       };
+
        aliases {
                usb0 = "/usb@c5008000";
                usb1 = "/usb@c5000000";
@@ -18,16 +22,16 @@
        };
 
        usb@c5004000 {
-               nvidia,phy-reset-gpio = <&gpio 169 0>; /* PV1 */
-               nvidia,vbus-gpio = <&gpio 217 0>; /* PBB1 */
+               nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_HIGH>;
+               nvidia,vbus-gpio = <&gpio TEGRA_GPIO(BB, 1) GPIO_ACTIVE_HIGH>;
        };
 
        usb@c5008000 {
-               nvidia,vbus-gpio = <&gpio 178 1>; /* PW2 low-active */
+               nvidia,vbus-gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;
        };
 
        nand-controller@70008000 {
-               nvidia,wp-gpios = <&gpio 144 0>; /* PS0 */
+               nvidia,wp-gpios = <&gpio TEGRA_GPIO(S, 0) GPIO_ACTIVE_HIGH>;
                nvidia,width = <8>;
                nvidia,timing = <15 100 25 80 25 10 15 10 100>;
 
@@ -39,7 +43,7 @@
 
        sdhci@c8000600 {
                status = "okay";
-               cd-gpios = <&gpio 23 1>; /* gpio PC7 */
+               cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>;
                bus-width = <4>;
        };
 };