diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-10-31 01:21:21 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-10-31 01:21:21 -0400 |
| commit | 7eb9572b2534672aa06291b5e26f8468158ce3e7 (patch) | |
| tree | 2ee8400ffa0684e844623f68b5f2345a746edeb8 | |
| parent | 60c805b89e68c288688e0b21c1530b8fd14a9c00 (diff) | |
| download | longterm-queue-4.8-7eb9572b2534672aa06291b5e26f8468158ce3e7.tar.gz | |
mmc: fix up patch that was supposed to be a revert
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/Revert-mmc-sdhci-msm-Enable-few-quirks.patch | 39 | ||||
| -rw-r--r-- | queue/mmc-sdhci-msm-Enable-few-quirks.patch | 33 |
2 files changed, 39 insertions, 33 deletions
diff --git a/queue/Revert-mmc-sdhci-msm-Enable-few-quirks.patch b/queue/Revert-mmc-sdhci-msm-Enable-few-quirks.patch new file mode 100644 index 0000000..9e2b124 --- /dev/null +++ b/queue/Revert-mmc-sdhci-msm-Enable-few-quirks.patch @@ -0,0 +1,39 @@ +From cb669fc6c5eae4c0ea5aeefe4c365902686ea833 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 + diff --git a/queue/mmc-sdhci-msm-Enable-few-quirks.patch b/queue/mmc-sdhci-msm-Enable-few-quirks.patch deleted file mode 100644 index 8f8078c..0000000 --- a/queue/mmc-sdhci-msm-Enable-few-quirks.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a0e3142869d29688de6f77be31aa7a401a4a88f1 Mon Sep 17 00:00:00 2001 -From: Ritesh Harjani <riteshh@codeaurora.org> -Date: Mon, 21 Nov 2016 12:07:18 +0530 -Subject: [PATCH] mmc: sdhci-msm: Enable few quirks - -commit a0e3142869d29688de6f77be31aa7a401a4a88f1 upstream. - -sdhc-msm controller needs this SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN -& SDHCI_QUIRK2_PRESET_VALUE_BROKEN to be set. Hence setting it. - -Signed-off-by: Sahitya Tummala <stummala@codeaurora.org> -Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org> -Acked-by: Adrian Hunter <adrian.hunter@intel.com> -Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> - -diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c -index aaeaf475e395..15a8b8e70ff9 100644 ---- a/drivers/mmc/host/sdhci-msm.c -+++ b/drivers/mmc/host/sdhci-msm.c -@@ -592,7 +592,9 @@ 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_SINGLE_POWER_WRITE | -+ SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN, -+ .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN, - .ops = &sdhci_msm_ops, - }; - --- -2.12.0 - |