Merge tag '2020-01-20-ti-2020.04' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti

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

diff --git a/arch/arm/dts/tegra124-jetson-tk1.dts b/arch/arm/dts/tegra124-jetson-tk1.dts
index 21ed1aef0bb297332c4d6ced7967bd89972f1ac6..59e080a8af6f6346a4d8677ac7a7fa032cdc27dc 100644 (file)
--- a/arch/arm/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/dts/tegra124-jetson-tk1.dts
@@ -16,8 +16,8 @@
                i2c2 = "/i2c@7000c400";
                i2c3 = "/i2c@7000c500";
                i2c4 = "/i2c@7000c700";
-               sdhci0 = "/sdhci@700b0600";
-               sdhci1 = "/sdhci@700b0400";
+               mmc0 = "/sdhci@700b0600";
+               mmc1 = "/sdhci@700b0400";
                spi0 = "/spi@7000d400";
                spi1 = "/spi@7000da00";
                usb0 = "/usb@7d000000";
@@ -29,7 +29,7 @@
                reg = <0x80000000 0x80000000>;
        };
 
-       pcie-controller@01003000 {
+       pcie@1003000 {
                status = "okay";
 
                avddio-pex-supply = <&vdd_1v05_run>;
@@ -312,6 +312,7 @@
        sdhci@700b0600 {
                status = "okay";
                bus-width = <8>;
+               non-removable;
        };
 
        usb@7d000000 {
@@ -479,3 +480,7 @@
                };
        };
 };
+
+&uartd {
+       status = "okay";
+};