| From eb810cf52109ee125c26601b118f60146a106ca4 Mon Sep 17 00:00:00 2001 |
| From: Eugen Hristev <eugen.hristev@microchip.com> |
| Date: Thu, 14 Nov 2019 12:59:26 +0000 |
| Subject: [PATCH] mmc: sdhci-of-at91: fix quirk2 overwrite |
| |
| commit fed23c5829ecab4ddc712d7b0046e59610ca3ba4 upstream. |
| |
| The quirks2 are parsed and set (e.g. from DT) before the quirk for broken |
| HS200 is set in the driver. |
| The driver needs to enable just this flag, not rewrite the whole quirk set. |
| |
| Fixes: 7871aa60ae00 ("mmc: sdhci-of-at91: add quirk for broken HS200") |
| Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com> |
| Acked-by: Adrian Hunter <adrian.hunter@intel.com> |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c |
| index e7d1920729fb..0ae986c42bc8 100644 |
| --- a/drivers/mmc/host/sdhci-of-at91.c |
| +++ b/drivers/mmc/host/sdhci-of-at91.c |
| @@ -358,7 +358,7 @@ static int sdhci_at91_probe(struct platform_device *pdev) |
| pm_runtime_use_autosuspend(&pdev->dev); |
| |
| /* HS200 is broken at this moment */ |
| - host->quirks2 = SDHCI_QUIRK2_BROKEN_HS200; |
| + host->quirks2 |= SDHCI_QUIRK2_BROKEN_HS200; |
| |
| ret = sdhci_add_host(host); |
| if (ret) |
| -- |
| 2.7.4 |
| |
