leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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+renesas@ragnatech.se>
Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Niklas Söderlund 2018-11-28 17:18:29 +01:00 committed by Ulf Hansson
parent 2c907f05dc
commit 0f4e2054c9
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/mmc/host/renesas_sdhi_core.c
View File

@ -47,6 +47,7 @@
#define SDHI_VER_GEN3_SDMMC 0xcd10 #define SDHI_VER_GEN3_SDMMC 0xcd10
struct renesas_sdhi_quirks { struct renesas_sdhi_quirks {
bool hs400_disabled;
bool hs400_4taps; bool hs400_4taps;
}; };
@ -602,15 +603,21 @@ static void renesas_sdhi_enable_dma(struct tmio_mmc_host *host, bool enable)
renesas_sdhi_sdbuf_width(host, enable ? width : 16); 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, .hs400_4taps = true,
}; };
static const struct soc_device_attribute sdhi_quirks_match[] = { static const struct soc_device_attribute sdhi_quirks_match[] = {
{ .soc_id = "r8a7795", .revision = "ES1.*", .data = &sdhi_quirks_4tap }, { .soc_id = "r8a7795", .revision = "ES1.*", .data = &sdhi_quirks_h3_m3w_es1 },
{ .soc_id = "r8a7795", .revision = "ES2.0", .data = &sdhi_quirks_4tap }, { .soc_id = "r8a7795", .revision = "ES2.0", .data = &sdhi_quirks_h3_es2 },
{ .soc_id = "r8a7796", .revision = "ES1.0", .data = &sdhi_quirks_4tap }, { .soc_id = "r8a7796", .revision = "ES1.0", .data = &sdhi_quirks_h3_m3w_es1 },
{ .soc_id = "r8a7796", .revision = "ES1.1", .data = &sdhi_quirks_4tap }, { .soc_id = "r8a7796", .revision = "ES1.1", .data = &sdhi_quirks_h3_m3w_es1 },
{ /* Sentinel. */ }, { /* Sentinel. */ },
}; };
@ -699,6 +706,9 @@ int renesas_sdhi_probe(struct platform_device *pdev,
host->multi_io_quirk = renesas_sdhi_multi_io_quirk; host->multi_io_quirk = renesas_sdhi_multi_io_quirk;
host->dma_ops = dma_ops; 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) if (quirks && quirks->hs400_4taps)
mmc_data->flags |= TMIO_MMC_HAVE_4TAP_HS400; mmc_data->flags |= TMIO_MMC_HAVE_4TAP_HS400;