Re: [PATCH v2 3/3] mmc: renesas_sdhi: disable HS400 on H3 ES1.x and M3-W ES1.x
Hi Niklas,
Thanks for your patch!
On Thu, Nov 1, 2018 at 12:15 AM Niklas Söderlund
wrote:
> From: Niklas Söderlund
>
> The Renesas BSP confirms that H3 ES1.x and M3-W ES1.x do not properly
M3-W ES1.[012] (also in the subject)? (ES1.2 is indistinguishable from ES1.1)
Or does this apply to M3-W ES1.3, too?
> 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
> @@ -607,15 +608,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_h3_m3w = {
> +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 =
> _quirks_h3_m3w },
> - { .soc_id = "r8a7795", .revision = "ES2.0", .data =
> _quirks_h3_m3w },
> - { .soc_id = "r8a7796", .revision = "ES1.0", .data =
> _quirks_h3_m3w },
> - { .soc_id = "r8a7796", .revision = "ES1.1", .data =
> _quirks_h3_m3w },
> + { .soc_id = "r8a7795", .revision = "ES1.*", .data =
> _quirks_h3_m3w_es1 },
> + { .soc_id = "r8a7795", .revision = "ES2.0", .data =
> _quirks_h3_es2 },
> + { .soc_id = "r8a7796", .revision = "ES1.0", .data =
> _quirks_h3_m3w_es1 },
> + { .soc_id = "r8a7796", .revision = "ES1.1", .data =
> _quirks_h3_m3w_es1 },
> { /* Sentinel. */ },
> };
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Re: [PATCH v2 3/3] mmc: renesas_sdhi: disable HS400 on H3 ES1.x and M3-W ES1.x
On Thu, Nov 01, 2018 at 12:13:40AM +0100, Niklas Söderlund wrote: > From: Niklas Söderlund > > The Renesas BSP confirms that H3 ES1.x and M3-W ES1.x 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 Reviewed-by: Wolfram Sang signature.asc Description: PGP signature
[PATCH v2 3/3] mmc: renesas_sdhi: disable HS400 on H3 ES1.x and M3-W ES1.x
From: Niklas Söderlund
The Renesas BSP confirms that H3 ES1.x and M3-W ES1.x 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
---
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 19d89b4dda64c13c..ed2c406fd62b5c7d 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_SDMMC0xcd10
struct renesas_sdhi_quirks {
+ bool hs400_disabled;
bool hs400_4taps;
};
@@ -607,15 +608,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_h3_m3w = {
+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 = _quirks_h3_m3w
},
- { .soc_id = "r8a7795", .revision = "ES2.0", .data = _quirks_h3_m3w
},
- { .soc_id = "r8a7796", .revision = "ES1.0", .data = _quirks_h3_m3w
},
- { .soc_id = "r8a7796", .revision = "ES1.1", .data = _quirks_h3_m3w
},
+ { .soc_id = "r8a7795", .revision = "ES1.*", .data =
_quirks_h3_m3w_es1 },
+ { .soc_id = "r8a7795", .revision = "ES2.0", .data = _quirks_h3_es2
},
+ { .soc_id = "r8a7796", .revision = "ES1.0", .data =
_quirks_h3_m3w_es1 },
+ { .soc_id = "r8a7796", .revision = "ES1.1", .data =
_quirks_h3_m3w_es1 },
{ /* Sentinel. */ },
};
@@ -704,6 +711,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
