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

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

[Yangbo Lu]

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>
---
 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 7f87a90..4ca640e 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.7.4

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

[Ulf Hansson]

On Mon, 16 Dec 2019 at 04:19, Yangbo Lu <yangbo.lu@nxp.com> wrote:
>
> 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>

Applied for fixes and added a stable tag, thanks!

Kind regards
Uffe


> ---
>  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 7f87a90..4ca640e 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.7.4
>