diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2019-06-10 17:12:20 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2019-06-10 17:12:20 +0200 |
| commit | 07649d955043232ed3617b92977f2383cc17299f (patch) | |
| tree | 351010d97d24d8a4031c008e40d5913ee4b27cea /drivers/mmc | |
| parent | 00a9584eadf39b12dac7495250dc508c6b106f81 (diff) | |
| parent | 97bf85b6ec9e6597ce81c79b26a28f7918fc4eaf (diff) | |
| download | linux-07649d955043232ed3617b92977f2383cc17299f.tar.gz linux-07649d955043232ed3617b92977f2383cc17299f.tar.bz2 linux-07649d955043232ed3617b92977f2383cc17299f.zip | |
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/renesas_sdhi_core.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c index db73f9f1b186..683c449a2f94 100644 --- a/drivers/mmc/host/renesas_sdhi_core.c +++ b/drivers/mmc/host/renesas_sdhi_core.c @@ -620,11 +620,16 @@ static const struct renesas_sdhi_quirks sdhi_quirks_h3_es2 = { .hs400_4taps = true, }; +static const struct renesas_sdhi_quirks sdhi_quirks_nohs400 = { + .hs400_disabled = true, +}; + static const struct soc_device_attribute sdhi_quirks_match[] = { { .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 }, + { .soc_id = "r8a7796", .revision = "ES1.[012]", .data = &sdhi_quirks_h3_m3w_es1 }, + { .soc_id = "r8a774a1", .revision = "ES1.[012]", .data = &sdhi_quirks_h3_m3w_es1 }, + { .soc_id = "r8a77980", .data = &sdhi_quirks_nohs400 }, { /* Sentinel. */ }, }; |