mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 23:58:05 +00:00
Code Issues Releases Wiki Activity

mmc: tmio,renesas_sdhi: move ssc_tappos to renesas_sdhi.h

Browse source 
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>
This commit is contained in:
Masahiro Yamada 2017-11-25 01:24:49 +09:00 committed by Ulf Hansson
parent 90d9510645
commit 852d258f84
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/mmc/host/renesas_sdhi.h
View file

@ -51,6 +51,7 @@ struct renesas_sdhi {
struct pinctrl *pinctrl; struct pinctrl *pinctrl;
struct pinctrl_state *pins_default, *pins_uhs; struct pinctrl_state *pins_default, *pins_uhs;
void __iomem *scc_ctl; void __iomem *scc_ctl;
u32 scc_tappos;
}; };
#define host_to_priv(host) \ #define host_to_priv(host) \

4
drivers/mmc/host/renesas_sdhi_core.c
View file

@ -268,7 +268,7 @@ static unsigned int renesas_sdhi_init_tuning(struct tmio_mmc_host *host)
~SH_MOBILE_SDHI_SCC_RVSCNTL_RVSEN & ~SH_MOBILE_SDHI_SCC_RVSCNTL_RVSEN &
sd_scc_read32(host, priv, SH_MOBILE_SDHI_SCC_RVSCNTL)); sd_scc_read32(host, priv, SH_MOBILE_SDHI_SCC_RVSCNTL));
sd_scc_write32(host, priv, SH_MOBILE_SDHI_SCC_DT2FF, host->scc_tappos); sd_scc_write32(host, priv, SH_MOBILE_SDHI_SCC_DT2FF, priv->scc_tappos);
/* Read TAPNUM */ /* Read TAPNUM */
return (sd_scc_read32(host, priv, SH_MOBILE_SDHI_SCC_DTCNTL) >> return (sd_scc_read32(host, priv, SH_MOBILE_SDHI_SCC_DTCNTL) >>
@ -591,7 +591,7 @@ int renesas_sdhi_probe(struct platform_device *pdev,
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) {
host->scc_tappos = taps->tap; priv->scc_tappos = taps->tap;
hit = true; hit = true;
break; break;
} }

1
drivers/mmc/host/tmio_mmc.h
View file

@ -166,7 +166,6 @@ struct tmio_mmc_host {
struct mutex ios_lock; /* protect set_ios() context */ struct mutex ios_lock; /* protect set_ios() context */
bool native_hotplug; bool native_hotplug;
bool sdio_irq_enabled; bool sdio_irq_enabled;
u32 scc_tappos;
/* Mandatory callback */ /* Mandatory callback */
int (*clk_enable)(struct tmio_mmc_host *host); int (*clk_enable)(struct tmio_mmc_host *host);