diff --git a/arch/arm/dts/tegra114-dalmore.dts b/arch/arm/dts/tegra114-dalmore.dts
index f0331a74017842428f9bab584209b310949de1dc..9325149cba6fee305b30be452dd21b53a03278e9 100644
--- a/arch/arm/dts/tegra114-dalmore.dts
+++ b/arch/arm/dts/tegra114-dalmore.dts
@@ -16,8 +16,8 @@
i2c2 = "/i2c@7000c400";
i2c3 = "/i2c@7000c500";
i2c4 = "/i2c@7000c700";
- sdhci0 = "/sdhci@78000600";
- sdhci1 = "/sdhci@78000400";
+ mmc0 = "/sdhci@78000600";
+ mmc1 = "/sdhci@78000400";
usb0 = "/usb@7d000000";
usb1 = "/usb@7d008000";
};
diff --git a/arch/arm/dts/tegra124-cei-tk1-som.dts b/arch/arm/dts/tegra124-cei-tk1-som.dts
index d22c0cabec7a0c84f84c49e4785a739664567e98..c4d4f9d89f12a318bce9e56838224d907ac5bba0 100644
--- a/arch/arm/dts/tegra124-cei-tk1-som.dts
+++ b/arch/arm/dts/tegra124-cei-tk1-som.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";
diff --git a/arch/arm/dts/tegra124-jetson-tk1.dts b/arch/arm/dts/tegra124-jetson-tk1.dts
index 4a63b6d86160db551adfbba5e4b61f15107b1a84..f1db952355b8f4326d59062465db91705de1eeef 100644
--- 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";
diff --git a/arch/arm/dts/tegra124-nyan-big.dts b/arch/arm/dts/tegra124-nyan-big.dts
index 20e0be30e980d9b92bd5f0a60eaebfa00248b80c..a0f1d09bee58bc94411c9df839dd1adbf0dd47df 100644
--- a/arch/arm/dts/tegra124-nyan-big.dts
+++ b/arch/arm/dts/tegra124-nyan-big.dts
@@ -17,8 +17,8 @@
i2c5 = "/i2c@7000d100";
rtc0 = "/i2c@0,7000d000/pmic@40";
rtc1 = "/rtc@0,7000e000";
- sdhci0 = "/sdhci@700b0600";
- sdhci1 = "/sdhci@700b0400";
+ mmc0 = "/sdhci@700b0600";
+ mmc1 = "/sdhci@700b0400";
spi0 = "/spi@7000d400";
spi1 = "/spi@7000da00";
usb0 = "/usb@7d000000";
diff --git a/arch/arm/dts/tegra124-venice2.dts b/arch/arm/dts/tegra124-venice2.dts
index 6c39563bfc64114cea26b19e1532dcb9ed88c325..add9244e68743fd43e27feb13b5c378e68327733 100644
--- 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";
diff --git a/arch/arm/dts/tegra186-p2771-0000.dtsi b/arch/arm/dts/tegra186-p2771-0000.dtsi
index 5550ac65de8ee1d2b9e7988aa553ffe22b3834ff..6e071082f9ee9754665f08c1da90e77b4fceaf9a 100644
--- a/arch/arm/dts/tegra186-p2771-0000.dtsi
+++ b/arch/arm/dts/tegra186-p2771-0000.dtsi
@@ -9,8 +9,8 @@
};
aliases {
- sdhci0 = "/sdhci@3460000";
- sdhci1 = "/sdhci@3400000";
+ mmc0 = "/sdhci@3460000";
+ mmc1 = "/sdhci@3400000";
i2c0 = "/bpmp/i2c";
i2c1 = "/i2c@3160000";
i2c2 = "/i2c@c240000";
diff --git a/arch/arm/dts/tegra20-colibri.dts b/arch/arm/dts/tegra20-colibri.dts
index 2cf24d3ee7711031196609608a449afafb077d37..a291d93c7d01acc89ecb29f7a5def3619123cb29 100644
--- a/arch/arm/dts/tegra20-colibri.dts
+++ b/arch/arm/dts/tegra20-colibri.dts
@@ -17,7 +17,7 @@
usb0 = "/usb@c5008000";
usb1 = "/usb@c5000000";
usb2 = "/usb@c5004000";
- sdhci0 = "/sdhci@c8000600";
+ mmc0 = "/sdhci@c8000600";
};
host1x@50000000 {
diff --git a/arch/arm/dts/tegra20-harmony.dts b/arch/arm/dts/tegra20-harmony.dts
index 8e9fe5ad3f162f84612d0e4b8ecb6e54b6b99733..cace7433948316433d22183cd74bbc2adfda8dac 100644
--- a/arch/arm/dts/tegra20-harmony.dts
+++ b/arch/arm/dts/tegra20-harmony.dts
@@ -17,8 +17,8 @@
serial0 = &uartd;
usb0 = "/usb@c5008000";
usb1 = "/usb@c5004000";
- sdhci0 = "/sdhci@c8000600";
- sdhci1 = "/sdhci@c8000200";
+ mmc0 = "/sdhci@c8000600";
+ mmc1 = "/sdhci@c8000200";
};
memory {
diff --git a/arch/arm/dts/tegra20-medcom-wide.dts b/arch/arm/dts/tegra20-medcom-wide.dts
index 3d37257189e0acfc19b89562ecd8858d4096271d..1c79d757467d756290480b236f3edb0241b939e5 100644
--- a/arch/arm/dts/tegra20-medcom-wide.dts
+++ b/arch/arm/dts/tegra20-medcom-wide.dts
@@ -12,7 +12,7 @@
aliases {
usb0 = "/usb@c5008000";
- sdhci0 = "/sdhci@c8000600";
+ mmc0 = "/sdhci@c8000600";
};
memory {
diff --git a/arch/arm/dts/tegra20-paz00.dts b/arch/arm/dts/tegra20-paz00.dts
index 946862e72095530bd93658b8c7e5c049b153b98d..cf6bd70189b867b0a7c718b4d94a4a1a410c5d62 100644
--- a/arch/arm/dts/tegra20-paz00.dts
+++ b/arch/arm/dts/tegra20-paz00.dts
@@ -12,8 +12,8 @@
aliases {
usb0 = "/usb@c5008000";
- sdhci0 = "/sdhci@c8000600";
- sdhci1 = "/sdhci@c8000000";
+ mmc0 = "/sdhci@c8000600";
+ mmc1 = "/sdhci@c8000000";
};
memory {
diff --git a/arch/arm/dts/tegra20-plutux.dts b/arch/arm/dts/tegra20-plutux.dts
index 7f57f1d4b573a37a32e822f100fedc3fa3c85541..1b642be99281b91cb65b1fd47a8ea88615eeba11 100644
--- a/arch/arm/dts/tegra20-plutux.dts
+++ b/arch/arm/dts/tegra20-plutux.dts
@@ -12,7 +12,7 @@
aliases {
usb0 = "/usb@c5008000";
- sdhci0 = "/sdhci@c8000600";
+ mmc0 = "/sdhci@c8000600";
};
memory {
diff --git a/arch/arm/dts/tegra20-seaboard.dts b/arch/arm/dts/tegra20-seaboard.dts
index 0a454f98cf3aa4ba213637d149f8dc4c955467a9..14210519a6c2dc54e60f6b086e42dec2d3a32ab7 100644
--- a/arch/arm/dts/tegra20-seaboard.dts
+++ b/arch/arm/dts/tegra20-seaboard.dts
@@ -18,8 +18,8 @@
rtc0 = "/i2c@7000d000/tps6586x@34";
rtc1 = "/rtc@7000e000";
serial0 = &uartd;
- sdhci0 = "/sdhci@c8000600";
- sdhci1 = "/sdhci@c8000400";
+ mmc0 = "/sdhci@c8000600";
+ mmc1 = "/sdhci@c8000400";
};
chosen {
diff --git a/arch/arm/dts/tegra20-tec.dts b/arch/arm/dts/tegra20-tec.dts
index 4f68077fafa1f493a37eb40f256ae29563ce53b8..4733c8134900b73df073f706ad66928518d98fc4 100644
--- a/arch/arm/dts/tegra20-tec.dts
+++ b/arch/arm/dts/tegra20-tec.dts
@@ -12,7 +12,7 @@
aliases {
usb0 = "/usb@c5008000";
- sdhci0 = "/sdhci@c8000600";
+ mmc0 = "/sdhci@c8000600";
};
memory {
diff --git a/arch/arm/dts/tegra20-trimslice.dts b/arch/arm/dts/tegra20-trimslice.dts
index db13ff965178dcedb0df08312493432ffc3cfdc4..be64e667cd5b4dfa9566537451e3d557e8b5208a 100644
--- 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";
};
diff --git a/arch/arm/dts/tegra20-ventana.dts b/arch/arm/dts/tegra20-ventana.dts
index 143e964459a0713b5a8e0f4de2d66a473750fc3f..371445622c1ea0ed59a07d1e8623ecdcc9d04b88 100644
--- a/arch/arm/dts/tegra20-ventana.dts
+++ b/arch/arm/dts/tegra20-ventana.dts
@@ -16,8 +16,8 @@
rtc1 = "/rtc@7000e000";
serial0 = &uartd;
usb0 = "/usb@c5008000";
- sdhci0 = "/sdhci@c8000600";
- sdhci1 = "/sdhci@c8000400";
+ mmc0 = "/sdhci@c8000600";
+ mmc1 = "/sdhci@c8000400";
};
memory {
diff --git a/arch/arm/dts/tegra20-whistler.dts b/arch/arm/dts/tegra20-whistler.dts
index d4577c99c5d9dab54c1a1ffb0706b9b0114be32f..447874674d72068b66c7d22217500fbd7b295443 100644
--- a/arch/arm/dts/tegra20-whistler.dts
+++ b/arch/arm/dts/tegra20-whistler.dts
@@ -13,8 +13,8 @@
aliases {
i2c0 = "/i2c@7000d000";
usb0 = "/usb@c5008000";
- sdhci0 = "/sdhci@c8000600";
- sdhci1 = "/sdhci@c8000400";
+ mmc0 = "/sdhci@c8000600";
+ mmc1 = "/sdhci@c8000400";
};
memory {
diff --git a/arch/arm/dts/tegra210-e2220-1170.dts b/arch/arm/dts/tegra210-e2220-1170.dts
index c6e21762815f36a74f65baa3462494b2b8f7ee9f..69af9cfe2a3d702bf3c64fb6bd93f1933b773e86 100644
--- a/arch/arm/dts/tegra210-e2220-1170.dts
+++ b/arch/arm/dts/tegra210-e2220-1170.dts
@@ -12,8 +12,8 @@
aliases {
i2c0 = "/i2c@0,7000d000";
- sdhci0 = "/sdhci@0,700b0600";
- sdhci1 = "/sdhci@0,700b0000";
+ mmc0 = "/sdhci@0,700b0600";
+ mmc1 = "/sdhci@0,700b0000";
usb0 = "/usb@0,7d000000";
};
diff --git a/arch/arm/dts/tegra210-p2371-0000.dts b/arch/arm/dts/tegra210-p2371-0000.dts
index 3aa59d087bc8672f9e0297fcf7c51f5245bbc4f1..44315476275ff738db6d8c6677af8337ad2f2a74 100644
--- a/arch/arm/dts/tegra210-p2371-0000.dts
+++ b/arch/arm/dts/tegra210-p2371-0000.dts
@@ -12,8 +12,8 @@
aliases {
i2c0 = "/i2c@0,7000d000";
- sdhci0 = "/sdhci@0,700b0600";
- sdhci1 = "/sdhci@0,700b0000";
+ mmc0 = "/sdhci@0,700b0600";
+ mmc1 = "/sdhci@0,700b0000";
usb0 = "/usb@0,7d000000";
};
diff --git a/arch/arm/dts/tegra210-p2371-2180.dts b/arch/arm/dts/tegra210-p2371-2180.dts
index c4db2a45c56196c0db721e2d277159e658b05bcd..aa18dd27ceafb5d14f4de835ea5e3a4ffcd8f7c5 100644
--- a/arch/arm/dts/tegra210-p2371-2180.dts
+++ b/arch/arm/dts/tegra210-p2371-2180.dts
@@ -12,8 +12,8 @@
aliases {
i2c0 = "/i2c@0,7000d000";
- sdhci0 = "/sdhci@0,700b0600";
- sdhci1 = "/sdhci@0,700b0000";
+ mmc0 = "/sdhci@0,700b0600";
+ mmc1 = "/sdhci@0,700b0000";
usb0 = "/usb@0,7d000000";
};
diff --git a/arch/arm/dts/tegra210-p2571.dts b/arch/arm/dts/tegra210-p2571.dts
index 726c893aa500b45b7f73c6d7fe8d94f78a1a6af5..d2ad9eded632f9de18a900747cc40183ba27b01a 100644
--- a/arch/arm/dts/tegra210-p2571.dts
+++ b/arch/arm/dts/tegra210-p2571.dts
@@ -17,8 +17,8 @@
i2c3 = "/i2c@0,7000c500";
i2c4 = "/i2c@0,7000c700";
i2c5 = "/i2c@0,7000d100";
- sdhci0 = "/sdhci@0,700b0600";
- sdhci1 = "/sdhci@0,700b0000";
+ mmc0 = "/sdhci@0,700b0600";
+ mmc1 = "/sdhci@0,700b0000";
spi0 = "/spi@0,7000d400";
spi1 = "/spi@0,7000da00";
spi2 = "/spi@0,70410000";
diff --git a/arch/arm/dts/tegra30-apalis.dts b/arch/arm/dts/tegra30-apalis.dts
index 3e0545c8befb18dc4f282ad17a0d2736652a1fe8..60e87a4f3af51209e973aa0ed7b9077935220dc3 100644
--- a/arch/arm/dts/tegra30-apalis.dts
+++ b/arch/arm/dts/tegra30-apalis.dts
@@ -15,9 +15,9 @@
i2c1 = "/i2c@7000c000";
i2c2 = "/i2c@7000c500";
i2c3 = "/i2c@7000c700";
- sdhci0 = "/sdhci@78000600";
- sdhci1 = "/sdhci@78000400";
- sdhci2 = "/sdhci@78000000";
+ mmc0 = "/sdhci@78000600";
+ mmc1 = "/sdhci@78000400";
+ mmc2 = "/sdhci@78000000";
spi0 = "/spi@7000d400";
spi1 = "/spi@7000dc00";
spi2 = "/spi@7000de00";
diff --git a/arch/arm/dts/tegra30-beaver.dts b/arch/arm/dts/tegra30-beaver.dts
index 2ff7497a37ea757617bf6c1515507aa2af1f4cad..340fcaf845c793f448e7af7268b813745fe76e5a 100644
--- a/arch/arm/dts/tegra30-beaver.dts
+++ b/arch/arm/dts/tegra30-beaver.dts
@@ -16,8 +16,8 @@
i2c2 = "/i2c@7000c400";
i2c3 = "/i2c@7000c500";
i2c4 = "/i2c@7000c700";
- sdhci0 = "/sdhci@78000600";
- sdhci1 = "/sdhci@78000000";
+ mmc0 = "/sdhci@78000600";
+ mmc1 = "/sdhci@78000000";
spi0 = "/spi@7000da00";
usb0 = "/usb@7d000000";
usb1 = "/usb@7d008000";
diff --git a/arch/arm/dts/tegra30-cardhu.dts b/arch/arm/dts/tegra30-cardhu.dts
index 3dc2043d547e91e465d5938314b1daee331af8b0..2237682e0ebdb9f144c83d4fe7ec6b1d892274e8 100644
--- a/arch/arm/dts/tegra30-cardhu.dts
+++ b/arch/arm/dts/tegra30-cardhu.dts
@@ -16,8 +16,8 @@
i2c2 = "/i2c@7000c400";
i2c3 = "/i2c@7000c500";
i2c4 = "/i2c@7000c700";
- sdhci0 = "/sdhci@78000600";
- sdhci1 = "/sdhci@78000000";
+ mmc0 = "/sdhci@78000600";
+ mmc1 = "/sdhci@78000000";
spi0 = "/spi@7000da00";
usb0 = "/usb@7d008000";
};
diff --git a/arch/arm/dts/tegra30-colibri.dts b/arch/arm/dts/tegra30-colibri.dts
index 487e1f6ae54cc6abde7b8a30f7c17a5b55408815..8784cd20b4c434f09da6e2c15dec84efcc21ab5a 100644
--- a/arch/arm/dts/tegra30-colibri.dts
+++ b/arch/arm/dts/tegra30-colibri.dts
@@ -14,8 +14,8 @@
i2c0 = "/i2c@7000d000";
i2c1 = "/i2c@7000c000";
i2c2 = "/i2c@7000c700";
- sdhci0 = "/sdhci@78000600";
- sdhci1 = "/sdhci@78000200";
+ mmc0 = "/sdhci@78000600";
+ mmc1 = "/sdhci@78000200";
spi0 = "/spi@7000d400";
usb0 = "/usb@7d000000";
usb1 = "/usb@7d004000"; /* on module only, for ASIX */
diff --git a/arch/arm/dts/tegra30-tamonten.dtsi b/arch/arm/dts/tegra30-tamonten.dtsi
index 50ae9ccce2784addcf7fd38dfb26ba3ce533e828..75c0f42d919f06ac692b90197a2d2fa09b733ef1 100644
--- a/arch/arm/dts/tegra30-tamonten.dtsi
+++ b/arch/arm/dts/tegra30-tamonten.dtsi
@@ -18,9 +18,9 @@
i2c2 = "/i2c@7000c400";
i2c3 = "/i2c@7000c500";
i2c4 = "/i2c@7000d000";
- sdhci0 = "/sdhci@78000600";
- sdhci1 = "/sdhci@78000400";
- sdhci2 = "/sdhci@78000000";
+ mmc0 = "/sdhci@78000600";
+ mmc1 = "/sdhci@78000400";
+ mmc2 = "/sdhci@78000000";
usb0 = "/usb@7d008000";
};
diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c
index 3d0845e31735acc0bb83fa973908ca7d876c529a..08b4bd48245a3166a982ec974cf9bfa33950d4a1 100644
--- a/drivers/mmc/tegra_mmc.c
+++ b/drivers/mmc/tegra_mmc.c
@@ -736,7 +736,7 @@ void tegra_mmc_init(void)
debug("%s entry\n", __func__);
/* See if any Tegra186 MMC controllers are present */
- count = fdtdec_find_aliases_for_id(blob, "sdhci",
+ count = fdtdec_find_aliases_for_id(blob, "mmc",
COMPAT_NVIDIA_TEGRA186_SDMMC, node_list,
CONFIG_SYS_MMC_MAX_DEVICE);
debug("%s: count of Tegra186 sdhci nodes is %d\n", __func__, count);
@@ -746,7 +746,7 @@ void tegra_mmc_init(void)
}
/* See if any Tegra210 MMC controllers are present */
- count = fdtdec_find_aliases_for_id(blob, "sdhci",
+ count = fdtdec_find_aliases_for_id(blob, "mmc",
COMPAT_NVIDIA_TEGRA210_SDMMC, node_list,
CONFIG_SYS_MMC_MAX_DEVICE);
debug("%s: count of Tegra210 sdhci nodes is %d\n", __func__, count);
@@ -756,7 +756,7 @@ void tegra_mmc_init(void)
}
/* See if any Tegra124 MMC controllers are present */
- count = fdtdec_find_aliases_for_id(blob, "sdhci",
+ count = fdtdec_find_aliases_for_id(blob, "mmc",
COMPAT_NVIDIA_TEGRA124_SDMMC, node_list,
CONFIG_SYS_MMC_MAX_DEVICE);
debug("%s: count of Tegra124 sdhci nodes is %d\n", __func__, count);
@@ -766,7 +766,7 @@ void tegra_mmc_init(void)
}
/* See if any Tegra30 MMC controllers are present */
- count = fdtdec_find_aliases_for_id(blob, "sdhci",
+ count = fdtdec_find_aliases_for_id(blob, "mmc",
COMPAT_NVIDIA_TEGRA30_SDMMC, node_list,
CONFIG_SYS_MMC_MAX_DEVICE);
debug("%s: count of T30 sdhci nodes is %d\n", __func__, count);
@@ -776,7 +776,7 @@ void tegra_mmc_init(void)
}
/* Now look for any Tegra20 MMC controllers */
- count = fdtdec_find_aliases_for_id(blob, "sdhci",
+ count = fdtdec_find_aliases_for_id(blob, "mmc",
COMPAT_NVIDIA_TEGRA20_SDMMC, node_list,
CONFIG_SYS_MMC_MAX_DEVICE);
debug("%s: count of T20 sdhci nodes is %d\n", __func__, count);