Commit 80d0be81 authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: renesas_sdhi: merge the SCC reset functions 



There is no user of renesas_sdhi_reset_scc() anymore, only
renesas_sdhi_disable_scc() so merge these functions into one. I guess
the seperation was cruft anyhow. The BSP doesn't have it anymore and I
can't recall the reason we had it.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Tested-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://lore.kernel.org/r/20201110162151.37622-3-wsa+renesas@sang-engineering.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 183edc06

drivers/mmc/host/renesas_sdhi_core.c

+4 −10
Original line number Diff line number Diff line
@@ -424,9 +424,11 @@ static void renesas_sdhi_hs400_complete(struct mmc_host *mmc) 
		priv->needs_adjust_hs400 = true;

}



static void renesas_sdhi_reset_scc(struct tmio_mmc_host *host,

				   struct renesas_sdhi *priv)

static void renesas_sdhi_disable_scc(struct mmc_host *mmc)

{

	struct tmio_mmc_host *host = mmc_priv(mmc);

	struct renesas_sdhi *priv = host_to_priv(host);



	sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, ~CLK_CTL_SCLKEN &

			sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));
@@ -434,14 +436,6 @@ static void renesas_sdhi_reset_scc(struct tmio_mmc_host *host, 
		       ~SH_MOBILE_SDHI_SCC_CKSEL_DTSEL &

		       sd_scc_read32(host, priv,

				     SH_MOBILE_SDHI_SCC_CKSEL));

}



static void renesas_sdhi_disable_scc(struct mmc_host *mmc)

{

	struct tmio_mmc_host *host = mmc_priv(mmc);

	struct renesas_sdhi *priv = host_to_priv(host);



	renesas_sdhi_reset_scc(host, priv);



	sd_scc_write32(host, priv, SH_MOBILE_SDHI_SCC_DTCNTL,

		       ~SH_MOBILE_SDHI_SCC_DTCNTL_TAPEN &