Commit 15064119 authored by Fabio Estevam's avatar Fabio Estevam Committed by Ulf Hansson

mmc: sdhci-esdhc-imx: Move mmc_of_parse() to the dt probe

mmc_of_parse() should be placed inside sdhci_esdhc_imx_probe_dt() as it
suits only for the dt case.
Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 19f44246
...@@ -903,7 +903,8 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev, ...@@ -903,7 +903,8 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
mmc_of_parse_voltage(np, &host->ocr_mask); mmc_of_parse_voltage(np, &host->ocr_mask);
return 0; /* call to generic mmc_of_parse to support additional capabilities */
return mmc_of_parse(host->mmc);
} }
#else #else
static inline int static inline int
...@@ -1048,11 +1049,6 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) ...@@ -1048,11 +1049,6 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V; host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V;
} }
/* call to generic mmc_of_parse to support additional capabilities */
err = mmc_of_parse(host->mmc);
if (err)
goto disable_clk;
err = sdhci_add_host(host); err = sdhci_add_host(host);
if (err) if (err)
goto disable_clk; goto disable_clk;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment