FAILED: patch "[PATCH] mmc: sdhci_am654: Disable HS400 for AM62P SR1.0 and SR1.1" failed to apply to 6.12-stable tree
Subsystems (4)
[email protected]
maintainerThe patch below does not apply to the 6.12-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-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x d2d7a96b29ea6ab093973a1a37d26126db70c79f
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025082207-defog-stunned-9396@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From d2d7a96b29ea6ab093973a1a37d26126db70c79f Mon Sep 17 00:00:00 2001
From: Judith Mendez <[email protected]>
Date: Wed, 20 Aug 2025 14:30:47 -0500
Subject: [PATCH] mmc: sdhci_am654: Disable HS400 for AM62P SR1.0 and SR1.1
This adds SDHCI_AM654_QUIRK_DISABLE_HS400 quirk which shall be used to disable HS400 support. AM62P SR1.0 and SR1.1 do not support HS400 due to errata i2458 [0] so disable HS400 for these SoC revisions.
[0] https://www.ti.com/lit/er/sprz574a/sprz574a.pdf
drivers/mmc/host/sdhci_am654.c +18 -0
@@ -156,6 +156,7 @@ struct sdhci_am654_data {#define SDHCI_AM654_QUIRK_FORCE_CDTEST BIT(0)#define SDHCI_AM654_QUIRK_SUPPRESS_V1P8_ENA BIT(1) +#define SDHCI_AM654_QUIRK_DISABLE_HS400 BIT(2) };struct window {
@@ -765,6 +766,7 @@ static int sdhci_am654_init(struct sdhci_host *host) {struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);struct sdhci_am654_data *sdhci_am654 =sdhci_pltfm_priv (pltfm_host); +struct device *dev =mmc_dev (host->mmc);u32 ctl_cfg_2 =0 ;u32 mask;u32 val;
@@ -820,6 +822,12 @@ static int sdhci_am654_init(struct sdhci_host *host)if (ret) goto err_cleanup_host; +if (sdhci_am654->quirks &SDHCI_AM654_QUIRK_DISABLE_HS400 && + host->mmc->caps2 & (MMC_CAP2_HS400 |MMC_CAP2_HS400_ES )) { +dev_info (dev,"HS400 mode not supported on this silicon revision, disabling it\n" ); + host->mmc->caps2 &= ~(MMC_CAP2_HS400 |MMC_CAP2_HS400_ES ); + } + ret =__sdhci_add_host (host);if (ret) goto err_cleanup_host;
@@ -883,6 +891,12 @@ static int sdhci_am654_get_of_property(struct platform_device *pdev,return 0 ; } +static const struct soc_device_attribute sdhci_am654_descope_hs400[] = { + { .family ="AM62PX" , .revision ="SR1.0" }, + { .family ="AM62PX" , .revision ="SR1.1" }, + {/* sentinel */ } +}; +static const struct of_device_id sdhci_am654_of_match[] = { { .compatible ="ti,am654-sdhci-5.1" ,
@@ -970,6 +984,10 @@ static int sdhci_am654_probe(struct platform_device *pdev)if (ret)return dev_err_probe (dev, ret,"parsing dt failed\n" ); + soc =soc_device_match (sdhci_am654_descope_hs400); +if (soc) + sdhci_am654->quirks |=SDHCI_AM654_QUIRK_DISABLE_HS400 ; + host->mmc_host_ops.start_signal_voltage_switch = sdhci_am654_start_signal_voltage_switch; host->mmc_host_ops.execute_tuning = sdhci_am654_execute_tuning;
Sasha Levin
maintainerPATCH 1/1 mmc: sdhci_am654: Disable HS400 for AM62P SR1.0 and SR1.1
From: Judith Mendez <[email protected]>
[ Upstream commit d2d7a96b29ea6ab093973a1a37d26126db70c79f ]
This adds SDHCI_AM654_QUIRK_DISABLE_HS400 quirk which shall be used to disable HS400 support. AM62P SR1.0 and SR1.1 do not support HS400 due to errata i2458 [0] so disable HS400 for these SoC revisions.
[0] https://www.ti.com/lit/er/sprz574a/sprz574a.pdf
--- drivers/mmc/host/sdhci_am654.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/mmc/host/sdhci_am654.c +18 -0
@@ -155,6 +155,7 @@ struct sdhci_am654_data {u32 tuning_loop;#define SDHCI_AM654_QUIRK_FORCE_CDTEST BIT(0) +#define SDHCI_AM654_QUIRK_DISABLE_HS400 BIT(1) };struct window {
@@ -734,6 +735,7 @@ static int sdhci_am654_init(struct sdhci_host *host) {struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);struct sdhci_am654_data *sdhci_am654 =sdhci_pltfm_priv (pltfm_host); +struct device *dev =mmc_dev (host->mmc);u32 ctl_cfg_2 =0 ;u32 mask;u32 val;
@@ -789,6 +791,12 @@ static int sdhci_am654_init(struct sdhci_host *host)if (ret) goto err_cleanup_host; +if (sdhci_am654->quirks &SDHCI_AM654_QUIRK_DISABLE_HS400 && + host->mmc->caps2 & (MMC_CAP2_HS400 |MMC_CAP2_HS400_ES )) { +dev_info (dev,"HS400 mode not supported on this silicon revision, disabling it\n" ); + host->mmc->caps2 &= ~(MMC_CAP2_HS400 |MMC_CAP2_HS400_ES ); + } + ret =__sdhci_add_host (host);if (ret) goto err_cleanup_host;
@@ -852,6 +860,12 @@ static int sdhci_am654_get_of_property(struct platform_device *pdev,return 0 ; } +static const struct soc_device_attribute sdhci_am654_descope_hs400[] = { + { .family ="AM62PX" , .revision ="SR1.0" }, + { .family ="AM62PX" , .revision ="SR1.1" }, + {/* sentinel */ } +}; +static const struct of_device_id sdhci_am654_of_match[] = { { .compatible ="ti,am654-sdhci-5.1" ,
@@ -943,6 +957,10 @@ static int sdhci_am654_probe(struct platform_device *pdev) goto err_pltfm_free; } + soc =soc_device_match (sdhci_am654_descope_hs400); +if (soc) + sdhci_am654->quirks |=SDHCI_AM654_QUIRK_DISABLE_HS400 ; + host->mmc_host_ops.execute_tuning = sdhci_am654_execute_tuning;pm_runtime_get_noresume (dev);
Signature · 1 line
2.50.1