Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Masahiro Yamada and committed by
Ulf Hansson
852d258f 90d95106

+3 -3
+1
drivers/mmc/host/renesas_sdhi.h
··· 51 51 struct pinctrl *pinctrl; 52 52 struct pinctrl_state *pins_default, *pins_uhs; 53 53 void __iomem *scc_ctl; 54 + u32 scc_tappos; 54 55 }; 55 56 56 57 #define host_to_priv(host) \
+2 -2
drivers/mmc/host/renesas_sdhi_core.c
··· 268 268 ~SH_MOBILE_SDHI_SCC_RVSCNTL_RVSEN & 269 269 sd_scc_read32(host, priv, SH_MOBILE_SDHI_SCC_RVSCNTL)); 270 270 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); 272 272 273 273 /* Read TAPNUM */ 274 274 return (sd_scc_read32(host, priv, SH_MOBILE_SDHI_SCC_DTCNTL) >> ··· 591 591 for (i = 0; i < of_data->taps_num; i++) { 592 592 if (taps[i].clk_rate == 0 || 593 593 taps[i].clk_rate == host->mmc->f_max) { 594 - host->scc_tappos = taps->tap; 594 + priv->scc_tappos = taps->tap; 595 595 hit = true; 596 596 break; 597 597 }
-1
drivers/mmc/host/tmio_mmc.h
··· 166 166 struct mutex ios_lock; /* protect set_ios() context */ 167 167 bool native_hotplug; 168 168 bool sdio_irq_enabled; 169 - u32 scc_tappos; 170 169 171 170 /* Mandatory callback */ 172 171 int (*clk_enable)(struct tmio_mmc_host *host);