FAILED: patch "[PATCH] mmc: sdhci-esdhc-imx: make "no-mmc-hs400" works" failed to apply to 5.10-stable tree
Subsystems (5)
[email protected]
maintainerThe patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 81dce1490e28439c3cd8a8650b862a712f3061ba
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023052651-reporter-deuce-3950@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
81dce1490e28 ("mmc: sdhci-esdhc-imx: make "no-mmc-hs400" works") f002f45a00ee ("mmc: sdhci-esdhc-imx: use the correct host caps for MMC_CAP_8_BIT_DATA") 1ed5c3b22fc7 ("mmc: sdhci-esdhc-imx: Propagate ESDHC_FLAG_HS400* only on 8bit bus") 2991ad76d253 ("mmc: sdhci-esdhc-imx: advertise HS400 mode through MMC caps") 854a22997ad5 ("mmc: sdhci-esdhc-imx: Convert the driver to DT-only")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 81dce1490e28439c3cd8a8650b862a712f3061ba Mon Sep 17 00:00:00 2001
From: Haibo Chen <[email protected]>
Date: Thu, 4 May 2023 19:22:22 +0800
Subject: [PATCH] mmc: sdhci-esdhc-imx: make "no-mmc-hs400" works
After commit 1ed5c3b22fc7 ("mmc: sdhci-esdhc-imx: Propagate ESDHC_FLAG_HS400* only on 8bit bus"), the property "no-mmc-hs400" from device tree file do not work any more.
This patch reorder the code, which can avoid the warning message "drop HS400 support since no 8-bit bus" and also make the property "no-mmc-hs400" from dts file works.
drivers/mmc/host/sdhci-esdhc-imx.c +10 -8
@@ -1634,6 +1634,10 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,if (ret)return ret; +/* HS400/HS400ES require 8 bit bus */ +if (!(host->mmc->caps &MMC_CAP_8_BIT_DATA )) + host->mmc->caps2 &= ~(MMC_CAP2_HS400 |MMC_CAP2_HS400_ES ); +if (mmc_gpio_get_cd (host->mmc) >=0 ) host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION ;
@@ -1724,10 +1728,6 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) host->mmc_host_ops.init_card = usdhc_init_card; } - 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;
@@ -1735,15 +1735,13 @@ 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 (host->mmc->caps &MMC_CAP_8_BIT_DATA && - imx_data->socdata->flags &ESDHC_FLAG_HS400 ) +if (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 (host->mmc->caps &MMC_CAP_8_BIT_DATA && - imx_data->socdata->flags &ESDHC_FLAG_HS400_ES ) { +if (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;
@@ -1765,6 +1763,10 @@ 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);