[PATCH v3 3/3] mmc: renesas_sdhi: disable HS400 on H3 ES1.x and M3-W ES1.[012]

[Niklas Söderlund]

The Renesas BSP confirms that H3 ES1.x and M3-W ES1.[012] do not
properly support HS400. Add a quirk to indicate this and disable HS400
in the MMC capabilities if the quirk is set.

Signed-off-by: Niklas Söderlund <niklas.soderlund+rene...@ragnatech.se>
Tested-by: Wolfram Sang <wsa+rene...@sang-engineering.com>
Reviewed-by: Wolfram Sang <wsa+rene...@sang-engineering.com>
Reviewed-by: Simon Horman <horms+rene...@verge.net.au>

---
* Changes since v2
- s/M3-W ES1.x/M3-W ES1.[012]/ in commit message and topic as HS400 is
  not disabled for M3-W ES1.3. Thanks Geert for pointing this out.
---
 drivers/mmc/host/renesas_sdhi_core.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/drivers/mmc/host/renesas_sdhi_core.c 
b/drivers/mmc/host/renesas_sdhi_core.c
index f20df18f49e0d7c5..d4df4e59d9f2a8ad 100644
--- a/drivers/mmc/host/renesas_sdhi_core.c
+++ b/drivers/mmc/host/renesas_sdhi_core.c
@@ -47,6 +47,7 @@
 #define SDHI_VER_GEN3_SDMMC    0xcd10
 
 struct renesas_sdhi_quirks {
+       bool hs400_disabled;
        bool hs400_4taps;
 };
 
@@ -598,15 +599,21 @@ static void renesas_sdhi_enable_dma(struct tmio_mmc_host 
*host, bool enable)
        renesas_sdhi_sdbuf_width(host, enable ? width : 16);
 }
 
-static const struct renesas_sdhi_quirks sdhi_quirks_4tap = {
+static const struct renesas_sdhi_quirks sdhi_quirks_h3_m3w_es1 = {
+       .hs400_disabled = true,
+       .hs400_4taps = true,
+};
+
+static const struct renesas_sdhi_quirks sdhi_quirks_h3_es2 = {
+       .hs400_disabled = false,
        .hs400_4taps = true,
 };
 
 static const struct soc_device_attribute sdhi_quirks_match[]  = {
-       { .soc_id = "r8a7795", .revision = "ES1.*", .data = &sdhi_quirks_4tap },
-       { .soc_id = "r8a7795", .revision = "ES2.0", .data = &sdhi_quirks_4tap },
-       { .soc_id = "r8a7796", .revision = "ES1.0", .data = &sdhi_quirks_4tap },
-       { .soc_id = "r8a7796", .revision = "ES1.1", .data = &sdhi_quirks_4tap },
+       { .soc_id = "r8a7795", .revision = "ES1.*", .data = 
&sdhi_quirks_h3_m3w_es1 },
+       { .soc_id = "r8a7795", .revision = "ES2.0", .data = &sdhi_quirks_h3_es2 
},
+       { .soc_id = "r8a7796", .revision = "ES1.0", .data = 
&sdhi_quirks_h3_m3w_es1 },
+       { .soc_id = "r8a7796", .revision = "ES1.1", .data = 
&sdhi_quirks_h3_m3w_es1 },
        { /* Sentinel. */ },
 };
 
@@ -695,6 +702,9 @@ int renesas_sdhi_probe(struct platform_device *pdev,
        host->multi_io_quirk    = renesas_sdhi_multi_io_quirk;
        host->dma_ops           = dma_ops;
 
+       if (quirks && quirks->hs400_disabled)
+               host->mmc->caps2 &= ~(MMC_CAP2_HS400 | MMC_CAP2_HS400_ES);
+
        if (quirks && quirks->hs400_4taps)
                mmc_data->flags |= TMIO_MMC_HAVE_4TAP_HS400;
 
-- 
2.19.1