From 67748a73b14b239283bc1ace7564a124b714b75e Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Tue, 13 Sep 2016 10:45:43 -0600 Subject: mmc: tegra: use correct alias for SDHCI/MMC nodes The Tegra MMC driver currently honors "sdhci" entries in /aliases. The MMC core however uses "mmc" entries in /aliases. This difference will be relevant once the Tegra MMC driver is converted to DM, and the MMC core handles alias lookups. To avoid issues during that conversion, fix the Tegra MMC driver and all Tegra DTs to use the same alias name as the MMC core does. Cc: Jaehoon Chung Signed-off-by: Stephen Warren Reviewed-by: Simon Glass Reviewed-by: Jaehoon Chung Signed-off-by: Tom Warren --- drivers/mmc/tegra_mmc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'drivers/mmc') diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c index 3d0845e..08b4bd4 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); -- cgit v1.1