Merge branch 'karo-tx-uboot' into kc-merge

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

diff --git a/arch/arm/dts/tegra20-medcom-wide.dts b/arch/arm/dts/tegra20-medcom-wide.dts
index a9a07f9bcd774f44c0ed7cba0574a9cf8a9cce3d..b6b57abdef94f9b2f79a7a44c860bab3919c8e3e 100644 (file)
--- a/arch/arm/dts/tegra20-medcom-wide.dts
+++ b/arch/arm/dts/tegra20-medcom-wide.dts
@@ -6,6 +6,10 @@
        model = "Avionic Design Medcom-Wide";
        compatible = "ad,medcom-wide", "nvidia,tegra20";
 
+       chosen {
+               stdout-path = &uartd;
+       };
+
        aliases {
                usb0 = "/usb@c5008000";
                sdhci0 = "/sdhci@c8000600";
@@ -69,9 +73,12 @@
 
                nvidia,bits-per-pixel = <16>;
                nvidia,pwm = <&pwm 0 500000>;
-               nvidia,backlight-enable-gpios = <&gpio 13 0>; /* PB5 */
-               nvidia,backlight-vdd-gpios = <&gpio 176 0>; /* PW0 */
-               nvidia,lvds-shutdown-gpios = <&gpio 10 0>; /* PB2 */
+               nvidia,backlight-enable-gpios = <&gpio TEGRA_GPIO(B, 5)
+                                                       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-timings = <0 0 0 0>;
        };
 };