| From 07bcc411567cb96f9d1fc84fff8d387118a2920d Mon Sep 17 00:00:00 2001 |
| From: Faiz Abbas <faiz_abbas@ti.com> |
| Date: Thu, 28 Nov 2019 16:34:22 +0530 |
| Subject: Revert "mmc: sdhci: Fix incorrect switch to HS mode" |
| |
| From: Faiz Abbas <faiz_abbas@ti.com> |
| |
| commit 07bcc411567cb96f9d1fc84fff8d387118a2920d upstream. |
| |
| This reverts commit c894e33ddc1910e14d6f2a2016f60ab613fd8b37. |
| |
| This commit aims to treat SD High speed and SDR25 as the same while |
| setting UHS Timings in HOST_CONTROL2 which leads to failures with some |
| SD cards in AM65x. Revert this commit. |
| |
| The issue this commit was trying to fix can be implemented in a platform |
| specific callback instead of common sdhci code. |
| |
| Cc: <stable@vger.kernel.org> |
| Signed-off-by: Faiz Abbas <faiz_abbas@ti.com> |
| Acked-by: Adrian Hunter <adrian.hunter@intel.com> |
| Link: https://lore.kernel.org/r/[email protected] |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/mmc/host/sdhci.c | 4 +--- |
| 1 file changed, 1 insertion(+), 3 deletions(-) |
| |
| --- a/drivers/mmc/host/sdhci.c |
| +++ b/drivers/mmc/host/sdhci.c |
| @@ -1450,9 +1450,7 @@ void sdhci_set_uhs_signaling(struct sdhc |
| ctrl_2 |= SDHCI_CTRL_UHS_SDR104; |
| else if (timing == MMC_TIMING_UHS_SDR12) |
| ctrl_2 |= SDHCI_CTRL_UHS_SDR12; |
| - else if (timing == MMC_TIMING_SD_HS || |
| - timing == MMC_TIMING_MMC_HS || |
| - timing == MMC_TIMING_UHS_SDR25) |
| + else if (timing == MMC_TIMING_UHS_SDR25) |
| ctrl_2 |= SDHCI_CTRL_UHS_SDR25; |
| else if (timing == MMC_TIMING_UHS_SDR50) |
| ctrl_2 |= SDHCI_CTRL_UHS_SDR50; |
