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

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

diff --git a/arch/arm/dts/tegra20-trimslice.dts b/arch/arm/dts/tegra20-trimslice.dts
index db13ff965178dcedb0df08312493432ffc3cfdc4..31f509ab12c8022be201ad448388533864dae3fe 100644 (file)
--- a/arch/arm/dts/tegra20-trimslice.dts
+++ b/arch/arm/dts/tegra20-trimslice.dts
@@ -11,10 +11,9 @@
        };
 
        aliases {
-               usb0 = "/usb@c5008000";
-               usb1 = "/usb@c5000000";
-               sdhci0 = "/sdhci@c8000600";
-               sdhci1 = "/sdhci@c8000000";
+               usb0 = "/usb@c5000000";
+               mmc0 = "/sdhci@c8000600";
+               mmc1 = "/sdhci@c8000000";
                spi0 = "/spi@7000c380";
        };
 
@@ -130,3 +129,7 @@
        };
 
 };
+
+&uarta {
+       status = "okay";
+};