Commit 9f809065 authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: renesas_sdhi: simplify reset routine a little 



The 'reset' pointer is only populated for Gen2+. So, we don't need to
check for that flag inside the routine.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-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/20201110142058.36393-5-wsa+renesas@sang-engineering.com


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

drivers/mmc/host/renesas_sdhi_core.c

+2 −3
Original line number Diff line number Diff line
@@ -552,6 +552,7 @@ static int renesas_sdhi_prepare_hs400_tuning(struct mmc_host *mmc, struct mmc_io 
	return 0;

}



/* only populated for TMIO_MMC_MIN_RCAR2 */

static void renesas_sdhi_reset(struct tmio_mmc_host *host)

{

	struct renesas_sdhi *priv = host_to_priv(host);
@@ -569,9 +570,7 @@ static void renesas_sdhi_reset(struct tmio_mmc_host *host) 
			       sd_scc_read32(host, priv, SH_MOBILE_SDHI_SCC_RVSCNTL));

	}



	if (host->pdata->flags & TMIO_MMC_MIN_RCAR2)

		sd_ctrl_write32_as_16_and_16(host, CTL_IRQ_MASK,

					     TMIO_MASK_INIT_RCAR2);

	sd_ctrl_write32_as_16_and_16(host, CTL_IRQ_MASK, TMIO_MASK_INIT_RCAR2);

}



#define SH_MOBILE_SDHI_MIN_TAP_ROW 3