Merge branch 'master' of git://git.denx.de/u-boot

[oweals/u-boot.git] / arch / arm / dts / tegra210-e2220-1170.dts

diff --git a/arch/arm/dts/tegra210-e2220-1170.dts b/arch/arm/dts/tegra210-e2220-1170.dts
index 75efbba1061e74dbbbb91ac2278c0231b3b404c0..e6b06862d8b524a15522f26e9fe238446796699a 100644 (file)
--- a/arch/arm/dts/tegra210-e2220-1170.dts
+++ b/arch/arm/dts/tegra210-e2220-1170.dts
@@ -11,34 +11,35 @@
        };
 
        aliases {
-               i2c0 = "/i2c@0,7000d000";
-               sdhci0 = "/sdhci@0,700b0600";
-               sdhci1 = "/sdhci@0,700b0000";
-               usb0 = "/usb@0,7d000000";
+               i2c0 = "/i2c@7000d000";
+               mmc0 = "/sdhci@700b0600";
+               mmc1 = "/sdhci@700b0000";
+               usb0 = "/usb@7d000000";
        };
 
        memory {
                reg = <0x0 0x80000000 0x0 0xc0000000>;
        };
 
-       sdhci@0,700b0000 {
+       sdhci@700b0000 {
                status = "okay";
                cd-gpios = <&gpio TEGRA_GPIO(Z, 1) GPIO_ACTIVE_LOW>;
                power-gpios = <&gpio TEGRA_GPIO(Z, 4) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
        };
 
-       sdhci@0,700b0600 {
+       sdhci@700b0600 {
                status = "okay";
                bus-width = <8>;
+               non-removable;
        };
 
-       i2c@0,7000d000 {
+       i2c@7000d000 {
                status = "okay";
                clock-frequency = <400000>;
        };
 
-       usb@0,7d000000 {
+       usb@7d000000 {
                status = "okay";
                dr_mode = "peripheral";
        };
@@ -56,3 +57,7 @@
                };
        };
 };
+
+&uarta {
+       status = "okay";
+};