| From e47016a1f3fc1c0bacba99153e76eb56d217bfba Mon Sep 17 00:00:00 2001 |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Date: Thu, 27 Apr 2017 12:37:20 +0200 |
| Subject: [PATCH] Revert "mmc: sdhci-msm: Enable few quirks" |
| |
| This reverts commit d84be51d1c1d3fa148a3abdeeb1455690df59e63 which is |
| commit a0e3142869d29688de6f77be31aa7a401a4a88f1 upstream. |
| |
| It causes problems and would need other patches backported to resolve |
| it, and it shouldn't have been applied to 4.9-stable. |
| |
| Reported-by: Georgi Djakov <georgi.djakov@linaro.org> |
| Cc: Sahitya Tummala <stummala@codeaurora.org> |
| Cc: Ritesh Harjani <riteshh@codeaurora.org> |
| Cc: Adrian Hunter <adrian.hunter@intel.com> |
| Cc: Ulf Hansson <ulf.hansson@linaro.org> |
| Cc: Sasha Levin <alexander.levin@verizon.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| [PG: v4.8.25 ID was ae98a7756e7752b77df8765a0992ea169e99234d ] |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c |
| index 437e4807727d..90ed2e12d345 100644 |
| --- a/drivers/mmc/host/sdhci-msm.c |
| +++ b/drivers/mmc/host/sdhci-msm.c |
| @@ -524,9 +524,7 @@ static const struct sdhci_ops sdhci_msm_ops = { |
| static const struct sdhci_pltfm_data sdhci_msm_pdata = { |
| .quirks = SDHCI_QUIRK_BROKEN_CARD_DETECTION | |
| SDHCI_QUIRK_NO_CARD_NO_RESET | |
| - SDHCI_QUIRK_SINGLE_POWER_WRITE | |
| - SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN, |
| - .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN, |
| + SDHCI_QUIRK_SINGLE_POWER_WRITE, |
| .ops = &sdhci_msm_ops, |
| }; |
| |
| -- |
| 2.12.0 |
| |