Merge branch 'master' of git://git.denx.de/u-boot-ti

[karo-tx-uboot.git] / arch / arm / dts / tegra20-seaboard.dts

diff --git a/arch/arm/dts/tegra20-seaboard.dts b/arch/arm/dts/tegra20-seaboard.dts
index c0e2e1e5fdb4d04c65c8f04e276f225c3dd4fb86..10f399284ae189ca9bee5c5d438dba3c7085bebc 100644 (file)
--- a/arch/arm/dts/tegra20-seaboard.dts
+++ b/arch/arm/dts/tegra20-seaboard.dts
@@ -10,6 +10,10 @@
                bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk1p3 rw rootwait";
        };
 
+       chosen {
+               stdout-path = &uartd;
+       };
+
        aliases {
                /* This defines the order of our ports */
                usb0 = "/usb@c5008000";
@@ -61,7 +65,7 @@
        };
 
        nand-controller@70008000 {
-               nvidia,wp-gpios = <&gpio 59 0>;         /* PH3 */
+               nvidia,wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
                nvidia,width = <8>;
                nvidia,timing = <26 100 20 80 20 10 12 10 70>;
                nand@0 {
@@ -147,7 +151,7 @@
        };
 
        usb@c5000000 {
-               nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */
+               nvidia,vbus-gpio = <&gpio TEGRA_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
                dr_mode = "otg";
        };
 
@@ -157,9 +161,9 @@
 
        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>;
        };
 
@@ -182,10 +186,14 @@
                hsync-active-high;
                nvidia,bits-per-pixel = <16>;
                nvidia,pwm = <&pwm 2 0>;
-               nvidia,backlight-enable-gpios = <&gpio 28 0>;   /* PD4 */
-               nvidia,lvds-shutdown-gpios = <&gpio 10 0>;      /* PB2 */
-               nvidia,backlight-vdd-gpios = <&gpio 176 0>;     /* PW0 */
-               nvidia,panel-vdd-gpios = <&gpio 22 0>;          /* PC6 */
+               nvidia,backlight-enable-gpios = <&gpio TEGRA_GPIO(D, 4)
+                                                       GPIO_ACTIVE_HIGH>;
+               nvidia,lvds-shutdown-gpios = <&gpio TEGRA_GPIO(B, 2)
+                                                       GPIO_ACTIVE_HIGH>;
+               nvidia,backlight-vdd-gpios = <&gpio TEGRA_GPIO(W, 0)
+                                                       GPIO_ACTIVE_HIGH>;
+               nvidia,panel-vdd-gpios = <&gpio TEGRA_GPIO(C, 6)
+                                                       GPIO_ACTIVE_HIGH>;
                nvidia,panel-timings = <400 4 203 17 15>;
        };
 };