summaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorGeorgi Djakov <georgi.djakov@linaro.org>2016-06-24 19:24:59 +0300
committerUlf Hansson <ulf.hansson@linaro.org>2016-07-25 10:35:01 +0200
commit9718f84b85396e090ca42fafa730410d286d61e3 (patch)
tree82c8e4b22f4a5f52f6fde2fba925620863346b9d /drivers/mmc
parent4f6aa3264af4d44caaa649dd3ff1fe98f5817251 (diff)
downloadlinux-rpi3-9718f84b85396e090ca42fafa730410d286d61e3.tar.gz
linux-rpi3-9718f84b85396e090ca42fafa730410d286d61e3.tar.bz2
linux-rpi3-9718f84b85396e090ca42fafa730410d286d61e3.zip
mmc: sdhci-msm: Do not reset the controller if no card in the slot
The controller does not clear the "reset bit" when it is reset without a card in the slot. Because of this, the following error message is seen while booting with no plugged SD card. mmc1: Reset 0x1 never completed. Add the SDHCI_QUIRK_NO_CARD_NO_RESET quirk to avoid this. Signed-off-by: Ivan T. Ivanov <ivan.ivanov@linaro.org> Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org> Tested-by: Bjorn Andersson <bjorn.andersson@linaro.org> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdhci-msm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
index 343e4bd4dc08..cc4274a023fd 100644
--- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c
@@ -427,6 +427,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,
.ops = &sdhci_msm_ops,
};