openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mmc: renesas_sdhi: use recent tap values for HS400 

New datasheets require different and new values for HS400 with 4taps or
8taps.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://lore.kernel.org/r/20191203200513.1758-6-wsa+renesas@sang-engineering.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Wolfram Sang 2019-12-03 21:05:13 +01:00 committed by Ulf Hansson
parent 12e3c55d23
commit c1a49782cc
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mmc/host/renesas_sdhi.h
View File

@ -14,8 +14,8 @@
struct renesas_sdhi_scc { struct renesas_sdhi_scc {
unsigned long clk_rate; /* clock rate for SDR104 */ unsigned long clk_rate; /* clock rate for SDR104 */
u32 tap; /* sampling clock position for SDR104 */ u32 tap; /* sampling clock position for SDR104/HS400 (8 TAP) */
u32 tap_hs400; /* sampling clock position for HS400 */ u32 tap_hs400_4tap; /* sampling clock position for HS400 (4 TAP) */
}; };
struct renesas_sdhi_of_data { struct renesas_sdhi_of_data {

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

@ -793,13 +793,16 @@ int renesas_sdhi_probe(struct platform_device *pdev,
host->mmc->caps2 & (MMC_CAP2_HS200_1_8V_SDR | host->mmc->caps2 & (MMC_CAP2_HS200_1_8V_SDR |
MMC_CAP2_HS400_1_8V))) { MMC_CAP2_HS400_1_8V))) {
const struct renesas_sdhi_scc *taps = of_data->taps; const struct renesas_sdhi_scc *taps = of_data->taps;
bool use_4tap = priv->quirks && priv->quirks->hs400_4taps;
bool hit = false; bool hit = false;
for (i = 0; i < of_data->taps_num; i++) { for (i = 0; i < of_data->taps_num; i++) {
if (taps[i].clk_rate == 0 || if (taps[i].clk_rate == 0 ||
taps[i].clk_rate == host->mmc->f_max) { taps[i].clk_rate == host->mmc->f_max) {
priv->scc_tappos = taps->tap; priv->scc_tappos = taps->tap;
priv->scc_tappos_hs400 = taps->tap_hs400; priv->scc_tappos_hs400 = use_4tap ?
taps->tap_hs400_4tap :
taps->tap;
hit = true; hit = true;
break; break;
} }

2
drivers/mmc/host/renesas_sdhi_internal_dmac.c
View File

@ -82,7 +82,7 @@ static struct renesas_sdhi_scc rcar_gen3_scc_taps[] = {
{ {
.clk_rate = 0, .clk_rate = 0,
.tap = 0x00000300, .tap = 0x00000300,
.tap_hs400 = 0x00000704, .tap_hs400_4tap = 0x00000100,
}, },
}; };