Skip to content

Commit 852d258

Browse files
masahir0ystorulf
authored andcommitted
mmc: tmio,renesas_sdhi: move ssc_tappos to renesas_sdhi.h
struct tmio_mmc_host has "scc_tappos", but in fact, it is Renesas private data. Move it to renesas_sdhi.h Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
1 parent 90d9510 commit 852d258

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

drivers/mmc/host/renesas_sdhi.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ struct renesas_sdhi {
5151
struct pinctrl *pinctrl;
5252
struct pinctrl_state *pins_default, *pins_uhs;
5353
void __iomem *scc_ctl;
54+
u32 scc_tappos;
5455
};
5556

5657
#define host_to_priv(host) \

drivers/mmc/host/renesas_sdhi_core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ static unsigned int renesas_sdhi_init_tuning(struct tmio_mmc_host *host)
268268
~SH_MOBILE_SDHI_SCC_RVSCNTL_RVSEN &
269269
sd_scc_read32(host, priv, SH_MOBILE_SDHI_SCC_RVSCNTL));
270270

271-
sd_scc_write32(host, priv, SH_MOBILE_SDHI_SCC_DT2FF, host->scc_tappos);
271+
sd_scc_write32(host, priv, SH_MOBILE_SDHI_SCC_DT2FF, priv->scc_tappos);
272272

273273
/* Read TAPNUM */
274274
return (sd_scc_read32(host, priv, SH_MOBILE_SDHI_SCC_DTCNTL) >>
@@ -591,7 +591,7 @@ int renesas_sdhi_probe(struct platform_device *pdev,
591591
for (i = 0; i < of_data->taps_num; i++) {
592592
if (taps[i].clk_rate == 0 ||
593593
taps[i].clk_rate == host->mmc->f_max) {
594-
host->scc_tappos = taps->tap;
594+
priv->scc_tappos = taps->tap;
595595
hit = true;
596596
break;
597597
}

drivers/mmc/host/tmio_mmc.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ struct tmio_mmc_host {
166166
struct mutex ios_lock; /* protect set_ios() context */
167167
bool native_hotplug;
168168
bool sdio_irq_enabled;
169-
u32 scc_tappos;
170169

171170
/* Mandatory callback */
172171
int (*clk_enable)(struct tmio_mmc_host *host);

0 commit comments

Comments
 (0)