From: Greg Kroah-Hartman Date: Mon, 23 Dec 2019 17:34:50 +0000 (-0500) Subject: 4.9-stable patches X-Git-Tag: v4.14.161~40 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f08d19c92b93b77a30d6ab91fb0a38df6ad13c4;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: revert-mmc-sdhci-fix-incorrect-switch-to-hs-mode.patch --- diff --git a/queue-4.9/revert-mmc-sdhci-fix-incorrect-switch-to-hs-mode.patch b/queue-4.9/revert-mmc-sdhci-fix-incorrect-switch-to-hs-mode.patch new file mode 100644 index 00000000000..a2ada90f539 --- /dev/null +++ b/queue-4.9/revert-mmc-sdhci-fix-incorrect-switch-to-hs-mode.patch @@ -0,0 +1,42 @@ +From 07bcc411567cb96f9d1fc84fff8d387118a2920d Mon Sep 17 00:00:00 2001 +From: Faiz Abbas +Date: Thu, 28 Nov 2019 16:34:22 +0530 +Subject: Revert "mmc: sdhci: Fix incorrect switch to HS mode" + +From: Faiz Abbas + +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: +Signed-off-by: Faiz Abbas +Acked-by: Adrian Hunter +Link: https://lore.kernel.org/r/20191128110422.25917-1-faiz_abbas@ti.com +Signed-off-by: Ulf Hansson +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -1557,9 +1557,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; diff --git a/queue-4.9/series b/queue-4.9/series index 1960568c3e4..a62f2b52b5c 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -85,3 +85,4 @@ perf-parse-fix-potential-memory-leak-when-handling-t.patch perf-intel-bts-does-not-support-aux-area-sampling.patch net-phy-initialise-phydev-speed-and-duplex-sanely.patch btrfs-don-t-prematurely-free-work-in-reada_start_mac.patch +revert-mmc-sdhci-fix-incorrect-switch-to-hs-mode.patch