aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorDirk Behme <dirk.behme@de.bosch.com>2014-10-01 05:25:32 -0400
committerUlf Hansson <ulf.hansson@linaro.org>2014-11-10 06:40:26 -0500
commitcd529af7eefae90b97fa90a24f1ad8ccef6ae41a (patch)
treef64c19c137e5e68a1f01f068ef4adb3ff3d5ec82 /drivers/mmc
parent18a098063592e4341bfb904ae9f4e41c08c74a63 (diff)
mmc: sdhci-esdhc-imx: don't exit in case of no pinctrl states
The commit ad93220de7da ("mmc: sdhci-esdhc-imx: change pinctrl state according to uhs mode") exits the probe in case there are no valid pinctrl states found. As there are configurations doing the pin mux properly in the boot loader, don't exit. Just warn, but go on in case if there are no pinctrl states in the device tree. Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com> Signed-off-by: Andrew Gabbasov <andrew_gabbasov@mentor.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdhci-esdhc-imx.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 587ee0edeb57..0135f00f826f 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -1031,11 +1031,8 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
1031 1031
1032 imx_data->pins_default = pinctrl_lookup_state(imx_data->pinctrl, 1032 imx_data->pins_default = pinctrl_lookup_state(imx_data->pinctrl,
1033 PINCTRL_STATE_DEFAULT); 1033 PINCTRL_STATE_DEFAULT);
1034 if (IS_ERR(imx_data->pins_default)) { 1034 if (IS_ERR(imx_data->pins_default))
1035 err = PTR_ERR(imx_data->pins_default); 1035 dev_warn(mmc_dev(host->mmc), "could not get default state\n");
1036 dev_err(mmc_dev(host->mmc), "could not get default state\n");
1037 goto disable_clk;
1038 }
1039 1036
1040 host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL; 1037 host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
1041 1038
@@ -1123,7 +1120,8 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
1123 } 1120 }
1124 1121
1125 /* sdr50 and sdr104 needs work on 1.8v signal voltage */ 1122 /* sdr50 and sdr104 needs work on 1.8v signal voltage */
1126 if ((boarddata->support_vsel) && esdhc_is_usdhc(imx_data)) { 1123 if ((boarddata->support_vsel) && esdhc_is_usdhc(imx_data) &&
1124 !IS_ERR(imx_data->pins_default)) {
1127 imx_data->pins_100mhz = pinctrl_lookup_state(imx_data->pinctrl, 1125 imx_data->pins_100mhz = pinctrl_lookup_state(imx_data->pinctrl,
1128 ESDHC_PINCTRL_STATE_100MHZ); 1126 ESDHC_PINCTRL_STATE_100MHZ);
1129 imx_data->pins_200mhz = pinctrl_lookup_state(imx_data->pinctrl, 1127 imx_data->pins_200mhz = pinctrl_lookup_state(imx_data->pinctrl,