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

Commit 0ec4ee3c authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Ulf Hansson
Browse files

mmc: sdhci-omap: Fix when capabilities are obtained from SDHCI_CAPABILITIES reg 



sdhci_omap_config_iodelay_pinctrl_state() requires caps and caps2 to be
initialized (speed mode capabilities like UHS/HS200) before it is
invoked. While mmc_of_parse() initializes caps/caps2 if capabilities is
populated in device tree, it will remain uninitialized for capabilities
obtained from SDHCI_CAPABILITIES register.
Fix sdhci_omap_config_iodelay_pinctrl_state() to be used even while
getting the capabilities from SDHCI_CAPABILITIES register by invoking
sdhci_setup_host() before sdhci_omap_config_iodelay_pinctrl_state().

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 6da6c0db

drivers/mmc/host/sdhci-omap.c

+12 −5
Original line number Diff line number Diff line
@@ -916,10 +916,6 @@ static int sdhci_omap_probe(struct platform_device *pdev) 
		goto err_put_sync;

	}



	ret = sdhci_omap_config_iodelay_pinctrl_state(omap_host);

	if (ret)

		goto err_put_sync;



	host->mmc_host_ops.get_ro = mmc_gpio_get_ro;

	host->mmc_host_ops.start_signal_voltage_switch =

					sdhci_omap_start_signal_voltage_switch;
@@ -930,12 +926,23 @@ static int sdhci_omap_probe(struct platform_device *pdev) 
	sdhci_read_caps(host);

	host->caps |= SDHCI_CAN_DO_ADMA2;



	ret = sdhci_add_host(host);

	ret = sdhci_setup_host(host);

	if (ret)

		goto err_put_sync;



	ret = sdhci_omap_config_iodelay_pinctrl_state(omap_host);

	if (ret)

		goto err_cleanup_host;



	ret = __sdhci_add_host(host);

	if (ret)

		goto err_cleanup_host;



	return 0;



err_cleanup_host:

	sdhci_cleanup_host(host);



err_put_sync:

	pm_runtime_put_sync(dev);