Commit 852d258f authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Ulf Hansson
Browse files

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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 90d95106

drivers/mmc/host/renesas_sdhi.h

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ struct renesas_sdhi { 
	struct pinctrl *pinctrl;

	struct pinctrl_state *pins_default, *pins_uhs;

	void __iomem *scc_ctl;

	u32 scc_tappos;

};



#define host_to_priv(host) \

drivers/mmc/host/renesas_sdhi_core.c

+2 −2
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static unsigned int renesas_sdhi_init_tuning(struct tmio_mmc_host *host) 
		       ~SH_MOBILE_SDHI_SCC_RVSCNTL_RVSEN &

		       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 */

	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++) {

			if (taps[i].clk_rate == 0 ||

			    taps[i].clk_rate == host->mmc->f_max) {

				host->scc_tappos = taps->tap;

				priv->scc_tappos = taps->tap;

				hit = true;

				break;

			}

drivers/mmc/host/tmio_mmc.h

+0 −1
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ struct tmio_mmc_host { 
	struct mutex		ios_lock;	/* protect set_ios() context */

	bool			native_hotplug;

	bool			sdio_irq_enabled;

	u32			scc_tappos;



	/* Mandatory callback */

	int (*clk_enable)(struct tmio_mmc_host *host);

CRA Git | Maintained and supported by SUSTech CRA and CCSE