mmc: tegra: use correct alias for SDHCI/MMC nodes

[karo-tx-uboot.git] / drivers / mmc / tegra_mmc.c

diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c
index f0a39a63c641524a8b8798499e70fbe79794290b..08b4bd48245a3166a982ec974cf9bfa33950d4a1 100644 (file)
--- a/drivers/mmc/tegra_mmc.c
+++ b/drivers/mmc/tegra_mmc.c
@@ -648,12 +648,12 @@ static int mmc_get_config(const void *blob, int node, struct mmc_host *host,
                struct udevice dev;
                int ret;
                dev.of_offset = node;
-               ret = reset_get_by_name(&dev, "sdmmc", &host->reset_ctl);
+               ret = reset_get_by_name(&dev, "sdhci", &host->reset_ctl);
                if (ret) {
-                       debug("reset_get_by_index() failed: %d\n", ret);
+                       debug("reset_get_by_name() failed: %d\n", ret);
                        return ret;
                }
-               ret = clk_get_by_name(&dev, "sdmmc", &host->clk);
+               ret = clk_get_by_index(&dev, 0, &host->clk);
                if (ret) {
                        debug("clk_get_by_index() failed: %d\n", ret);
                        return ret;
@@ -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);