Merge tag 'u-boot-imx-20191009' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[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..e19001ee2bdfdfc6e074c9beaa3158ee0ec3cb0f 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";
        };
 
@@ -31,7 +30,7 @@
                spi-max-frequency = <25000000>;
        };
 
-       pcie-controller@80003000 {
+       pcie@80003000 {
                status = "okay";
 
                avdd-pex-supply = <&pci_vdd_reg>;
@@ -130,3 +129,7 @@
        };
 
 };
+
+&uarta {
+       status = "okay";
+};