Commit 1ed5c3b2 authored by Sascha Hauer's avatar Sascha Hauer Committed by Ulf Hansson
Browse files

mmc: sdhci-esdhc-imx: Propagate ESDHC_FLAG_HS400* only on 8bit bus 



The core issues the warning "drop HS400 support since no 8-bit bus" when
one of the ESDHC_FLAG_HS400* flags is set on a non 8bit capable host. To
avoid this warning set these flags only on hosts that actually can do
8bit, i.e. have bus-width = <8> set in the device tree.

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: default avatarHaibo Chen <haibo.chen@nxp.com>
Fixes: 029e2476 ("mmc: sdhci-esdhc-imx: add HS400_ES support for i.MX8QXP")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20221013093248.2220802-1-s.hauer@pengutronix.de


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

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

+8 −6
Original line number Diff line number Diff line
@@ -1660,6 +1660,10 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) 
		host->mmc_host_ops.execute_tuning = usdhc_execute_tuning;

	}



	err = sdhci_esdhc_imx_probe_dt(pdev, host, imx_data);

	if (err)

		goto disable_ahb_clk;



	if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)

		sdhci_esdhc_ops.platform_execute_tuning =

					esdhc_executing_tuning;
@@ -1667,13 +1671,15 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) 
	if (imx_data->socdata->flags & ESDHC_FLAG_ERR004536)

		host->quirks |= SDHCI_QUIRK_BROKEN_ADMA;



	if (imx_data->socdata->flags & ESDHC_FLAG_HS400)

	if (host->caps & MMC_CAP_8_BIT_DATA &&

	    imx_data->socdata->flags & ESDHC_FLAG_HS400)

		host->mmc->caps2 |= MMC_CAP2_HS400;



	if (imx_data->socdata->flags & ESDHC_FLAG_BROKEN_AUTO_CMD23)

		host->quirks2 |= SDHCI_QUIRK2_ACMD23_BROKEN;



	if (imx_data->socdata->flags & ESDHC_FLAG_HS400_ES) {

	if (host->caps & MMC_CAP_8_BIT_DATA &&

	    imx_data->socdata->flags & ESDHC_FLAG_HS400_ES) {

		host->mmc->caps2 |= MMC_CAP2_HS400_ES;

		host->mmc_host_ops.hs400_enhanced_strobe =

					esdhc_hs400_enhanced_strobe;
@@ -1695,10 +1701,6 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) 
			goto disable_ahb_clk;

	}



	err = sdhci_esdhc_imx_probe_dt(pdev, host, imx_data);

	if (err)

		goto disable_ahb_clk;



	sdhci_esdhc_imx_hwinit(host);



	err = sdhci_add_host(host);