|
@@ -1031,11 +1031,8 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
|
|
|
|
|
|
|
|
imx_data->pins_default = pinctrl_lookup_state(imx_data->pinctrl,
|
|
imx_data->pins_default = pinctrl_lookup_state(imx_data->pinctrl,
|
|
|
PINCTRL_STATE_DEFAULT);
|
|
PINCTRL_STATE_DEFAULT);
|
|
|
- if (IS_ERR(imx_data->pins_default)) {
|
|
|
|
|
- err = PTR_ERR(imx_data->pins_default);
|
|
|
|
|
- dev_err(mmc_dev(host->mmc), "could not get default state\n");
|
|
|
|
|
- goto disable_clk;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ if (IS_ERR(imx_data->pins_default))
|
|
|
|
|
+ dev_warn(mmc_dev(host->mmc), "could not get default state\n");
|
|
|
|
|
|
|
|
host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
|
|
host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
|
|
|
|
|
|
|
@@ -1123,7 +1120,8 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/* sdr50 and sdr104 needs work on 1.8v signal voltage */
|
|
/* sdr50 and sdr104 needs work on 1.8v signal voltage */
|
|
|
- if ((boarddata->support_vsel) && esdhc_is_usdhc(imx_data)) {
|
|
|
|
|
|
|
+ if ((boarddata->support_vsel) && esdhc_is_usdhc(imx_data) &&
|
|
|
|
|
+ !IS_ERR(imx_data->pins_default)) {
|
|
|
imx_data->pins_100mhz = pinctrl_lookup_state(imx_data->pinctrl,
|
|
imx_data->pins_100mhz = pinctrl_lookup_state(imx_data->pinctrl,
|
|
|
ESDHC_PINCTRL_STATE_100MHZ);
|
|
ESDHC_PINCTRL_STATE_100MHZ);
|
|
|
imx_data->pins_200mhz = pinctrl_lookup_state(imx_data->pinctrl,
|
|
imx_data->pins_200mhz = pinctrl_lookup_state(imx_data->pinctrl,
|