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

[oweals/u-boot.git] / arch / arm / dts / tegra124-venice2.dts

diff --git a/arch/arm/dts/tegra124-venice2.dts b/arch/arm/dts/tegra124-venice2.dts
index 9de86c014361476b33add11e6da6fe5df1baf7fb..7e9c6aa1839e6b25cb0fdbb2d28acc0ede64bdd3 100644 (file)
--- a/arch/arm/dts/tegra124-venice2.dts
+++ b/arch/arm/dts/tegra124-venice2.dts
@@ -17,8 +17,8 @@
                i2c3 = "/i2c@7000c500";
                i2c4 = "/i2c@7000c700";
                i2c5 = "/i2c@7000d100";
-               sdhci0 = "/sdhci@700b0600";
-               sdhci1 = "/sdhci@700b0400";
+               mmc0 = "/sdhci@700b0600";
+               mmc1 = "/sdhci@700b0400";
                spi0 = "/spi@7000d400";
                spi1 = "/spi@7000da00";
                usb0 = "/usb@7d000000";
@@ -81,6 +81,7 @@
        sdhci@700b0600 {
                status = "okay";
                bus-width = <8>;
+               non-removable;
        };
 
        usb@7d000000 {
@@ -108,3 +109,7 @@
        };
 
 };
+
+&uarta {
+       status = "okay";
+};