From: Stephen Warren Date: Thu, 18 Aug 2016 17:08:44 +0000 (-0600) Subject: ARM: tegra: fix Tegra186 SDHCI clock/reset names X-Git-Tag: v2016.09~74 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=eb3f68afbc8b8b2bdb491f61c342aabb776c8321;p=u-boot ARM: tegra: fix Tegra186 SDHCI clock/reset names The Tegra SDHCI binding dictates that the reseet name for the Tegra SDHCI clock be "sdhci" not "sdmmc", and that the clock is accessed by index rather than by name. Fix the Tegra186 DT and MMC driver to honor this. Signed-off-by: Stephen Warren Signed-off-by: Tom Warren --- diff --git a/arch/arm/dts/tegra186.dtsi b/arch/arm/dts/tegra186.dtsi index 54ef7e3e4a..65ff4246c0 100644 --- a/arch/arm/dts/tegra186.dtsi +++ b/arch/arm/dts/tegra186.dtsi @@ -120,9 +120,8 @@ compatible = "nvidia,tegra186-sdhci"; reg = <0x0 0x03400000 0x0 0x200>; resets = <&bpmp TEGRA186_RESET_SDMMC1>; - reset-names = "sdmmc"; + reset-names = "sdhci"; clocks = <&bpmp TEGRA186_CLK_SDMMC1>; - clock-names = "sdmmc"; interrupts = ; status = "disabled"; }; @@ -131,9 +130,8 @@ compatible = "nvidia,tegra186-sdhci"; reg = <0x0 0x03460000 0x0 0x200>; resets = <&bpmp TEGRA186_RESET_SDMMC4>; - reset-names = "sdmmc"; + reset-names = "sdhci"; clocks = <&bpmp TEGRA186_CLK_SDMMC4>; - clock-names = "sdmmc"; interrupts = ; status = "disabled"; }; diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c index f0a39a63c6..3d0845e317 100644 --- 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;