Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd529af7 authored by Dirk Behme's avatar Dirk Behme Committed by Ulf Hansson
Browse files

mmc: sdhci-esdhc-imx: don't exit in case of no pinctrl states 



The commit ad93220d ("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: default avatarDirk Behme <dirk.behme@de.bosch.com>
Signed-off-by: default avatarAndrew Gabbasov <andrew_gabbasov@mentor.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 18a09806

drivers/mmc/host/sdhci-esdhc-imx.c

+4 −6
Original line number Diff line number Diff line
@@ -1031,11 +1031,8 @@ 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;

	}

	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;
@@ -1123,7 +1120,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,