diff options
| author | Marek Vasut <marek.vasut+renesas@gmail.com> | 2018-06-13 08:02:55 +0200 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2018-12-03 12:51:17 +0100 |
| commit | 95ead3d98de4e2ccdd5b36efb9ca3d2a97835d7e (patch) | |
| tree | 0c54b3a181c523e76610dc43d7e399709e1d4e1d /drivers/mmc | |
| parent | d34bd2deda65f099b47305b4cecbdd58106884fe (diff) | |
| download | u-boot-95ead3d98de4e2ccdd5b36efb9ca3d2a97835d7e.tar.gz u-boot-95ead3d98de4e2ccdd5b36efb9ca3d2a97835d7e.tar.xz u-boot-95ead3d98de4e2ccdd5b36efb9ca3d2a97835d7e.zip | |
mmc: tmio: sdhi: Move tap_pos to private data
Move the tap_pos variable, which is the HS200/HS400/SDR104 calibration
offset, into private data, so it can be passed around. This is done in
preparation for the HS400 mode, which needs to adjust this value.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/renesas-sdhi.c | 5 | ||||
| -rw-r--r-- | drivers/mmc/tmio-common.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c index 0cc6f27279..1ed50d6292 100644 --- a/drivers/mmc/renesas-sdhi.c +++ b/drivers/mmc/renesas-sdhi.c @@ -125,7 +125,6 @@ static int renesas_sdhi_select_tuning(struct tmio_sd_priv *priv, unsigned int smpcmp) { unsigned long tap_cnt; /* counter of tuning success */ - unsigned long tap_set; /* tap position */ unsigned long tap_start;/* start position of tuning success */ unsigned long tap_end; /* end position of tuning success */ unsigned long ntap; /* temporary counter of tuning success */ @@ -209,12 +208,12 @@ static int renesas_sdhi_select_tuning(struct tmio_sd_priv *priv, select = true; if (select) - tap_set = ((tap_start + tap_end) / 2) % tap_num; + priv->tap_set = ((tap_start + tap_end) / 2) % tap_num; else return -EIO; /* Set SCC */ - tmio_sd_writel(priv, tap_set, RENESAS_SDHI_SCC_TAPSET); + tmio_sd_writel(priv, priv->tap_set, RENESAS_SDHI_SCC_TAPSET); /* Enable auto re-tuning */ reg = tmio_sd_readl(priv, RENESAS_SDHI_SCC_RVSCNTL); diff --git a/drivers/mmc/tmio-common.h b/drivers/mmc/tmio-common.h index 6591c61c3c..9a427b5311 100644 --- a/drivers/mmc/tmio-common.h +++ b/drivers/mmc/tmio-common.h @@ -135,6 +135,9 @@ struct tmio_sd_priv { #if CONFIG_IS_ENABLED(CLK) struct clk clk; #endif +#if CONFIG_IS_ENABLED(RENESAS_SDHI) + u8 tap_set; +#endif ulong (*clk_get_rate)(struct tmio_sd_priv *); }; |