ARM: tegra: pull Tegra30 SoC DT from Linux v4.7

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

diff --git a/arch/arm/dts/tegra20-trimslice.dts b/arch/arm/dts/tegra20-trimslice.dts
index db13ff965178dcedb0df08312493432ffc3cfdc4..be64e667cd5b4dfa9566537451e3d557e8b5208a 100644 (file)
--- a/arch/arm/dts/tegra20-trimslice.dts
+++ b/arch/arm/dts/tegra20-trimslice.dts
@@ -13,8 +13,8 @@
        aliases {
                usb0 = "/usb@c5008000";
                usb1 = "/usb@c5000000";
-               sdhci0 = "/sdhci@c8000600";
-               sdhci1 = "/sdhci@c8000000";
+               mmc0 = "/sdhci@c8000600";
+               mmc1 = "/sdhci@c8000000";
                spi0 = "/spi@7000c380";
        };