Commit b161d87d authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: renesas_sdhi: probe into TMIO after SCC parameters have been setup 



Setting up the SCC parameters does not need a probed TMIO device. But in
the near future, probing the TMIO device needs the SCC parameters setup.
So, fix the ordering.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Tested-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://lore.kernel.org/r/20201110142058.36393-3-wsa+renesas@sang-engineering.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 45bffc37

drivers/mmc/host/renesas_sdhi_core.c

+4 −4
Original line number Diff line number Diff line
@@ -1067,10 +1067,6 @@ int renesas_sdhi_probe(struct platform_device *pdev, 
			quirks->hs400_calib_table + 1);

	}



	ret = tmio_mmc_host_probe(host);

	if (ret < 0)

		goto edisclk;



	/* Enable tuning iff we have an SCC and a supported mode */

	if (of_data && of_data->scc_offset &&

	    (host->mmc->caps & MMC_CAP_UHS_SDR104 ||
@@ -1102,6 +1098,10 @@ int renesas_sdhi_probe(struct platform_device *pdev, 
		host->ops.hs400_complete = renesas_sdhi_hs400_complete;

	}



	ret = tmio_mmc_host_probe(host);

	if (ret < 0)

		goto edisclk;



	num_irqs = platform_irq_count(pdev);

	if (num_irqs < 0) {

		ret = num_irqs;