Hi, Any comments on this? > -----Original Message----- > From: Andrew Gabbasov [mailto:andrew_gabbasov@xxxxxxxxxx] > Sent: Wednesday, October 01, 2014 1:26 PM > To: linux-mmc@xxxxxxxxxxxxxxx > Subject: [PATCH] mmc: sdhci-esdhc-imx: don't exit in case of no pinctrl states > > From: Dirk Behme <dirk.behme@xxxxxxxxxxxx> > > 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@xxxxxxxxxxxx> > Signed-off-by: Andrew Gabbasov <andrew_gabbasov@xxxxxxxxxx> > --- > drivers/mmc/host/sdhci-esdhc-imx.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c > index ccec0e3..b714b9d 100644 > --- a/drivers/mmc/host/sdhci-esdhc-imx.c > +++ b/drivers/mmc/host/sdhci-esdhc-imx.c > @@ -1012,9 +1012,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) > imx_data->pins_default = pinctrl_lookup_state(imx_data->pinctrl, > 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; > + dev_warn(mmc_dev(host->mmc), "could not get default state\n"); > } > > host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL; > @@ -1103,7 +1101,8 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) > } > > /* 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, > ESDHC_PINCTRL_STATE_100MHZ); > imx_data->pins_200mhz = pinctrl_lookup_state(imx_data->pinctrl, > -- > 2.1.0 Thanks. Best regards, Andrew Gabbasov -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
