From fe0acab448f68c3146235afe03fb932e242ec94c Mon Sep 17 00:00:00 2001

From: Yangbo Lu <yangbo.lu@nxp.com>

Date: Mon, 16 Dec 2019 11:18:42 +0800

Subject: [PATCH] mmc: sdhci-of-esdhc: fix P2020 errata handling

Git-commit: fe0acab448f68c3146235afe03fb932e242ec94c

Patch-mainline: v5.5-rc3

References: bsc#1051510

Two previous patches introduced below quirks for P2020 platforms.

- SDHCI_QUIRK_RESET_AFTER_REQUEST

- SDHCI_QUIRK_BROKEN_TIMEOUT_VAL

The patches made a mistake to add them in quirks2 of sdhci_host

structure, while they were defined for quirks.

	host->quirks2 |= SDHCI_QUIRK_RESET_AFTER_REQUEST;

	host->quirks2 |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;

This patch is to fix them.

	host->quirks |= SDHCI_QUIRK_RESET_AFTER_REQUEST;

	host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;

Fixes: 05cb6b2a66fa ("mmc: sdhci-of-esdhc: add erratum eSDHC-A001 and A-008358 support")

Fixes: a46e42712596 ("mmc: sdhci-of-esdhc: add erratum eSDHC5 support")

Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>

Cc: stable@vger.kernel.org

Link: https://lore.kernel.org/r/20191216031842.40068-1-yangbo.lu@nxp.com

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/mmc/host/sdhci-of-esdhc.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c

index 7f87a90bf56a..4ca640e6fd55 100644

--- a/drivers/mmc/host/sdhci-of-esdhc.c

+++ b/drivers/mmc/host/sdhci-of-esdhc.c

@@ -1300,8 +1300,8 @@ static int sdhci_esdhc_probe(struct platform_device *pdev)

 		host->quirks &= ~SDHCI_QUIRK_NO_BUSY_IRQ;

 	if (of_find_compatible_node(NULL, NULL, "fsl,p2020-esdhc")) {

-		host->quirks2 |= SDHCI_QUIRK_RESET_AFTER_REQUEST;

-		host->quirks2 |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;

+		host->quirks |= SDHCI_QUIRK_RESET_AFTER_REQUEST;

+		host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;

 	}

 	if (of_device_is_compatible(np, "fsl,p5040-esdhc") ||

-- 

2.16.4