Commit 0e08a411 authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: renesas_sdhi: don't hardcode SDIF values 



Use a macro to name the hardcoded values. Also, move the SDIF register
definition into the SDHI driver because this is an SDHI extension.

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>
Link: https://lore.kernel.org/r/20201111100244.15823-3-wsa+renesas@sang-engineering.com


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

drivers/mmc/host/renesas_sdhi_core.c

+5 −2
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ 
#define HOST_MODE_GEN3_32BIT	(HOST_MODE_GEN3_WMODE | HOST_MODE_GEN3_BUSWIDTH)

#define HOST_MODE_GEN3_64BIT	0



#define CTL_SDIF_MODE	0xe6

#define SDIF_MODE_HS400		BIT(0)



#define SDHI_VER_GEN2_SDR50	0x490c

#define SDHI_VER_RZ_A1		0x820b

/* very old datasheets said 0x490c for SDR104, too. They are wrong! */
@@ -381,7 +384,7 @@ static void renesas_sdhi_hs400_complete(struct mmc_host *mmc) 
		sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));



	/* Set HS400 mode */

	sd_ctrl_write16(host, CTL_SDIF_MODE, 0x0001 |

	sd_ctrl_write16(host, CTL_SDIF_MODE, SDIF_MODE_HS400 |

			sd_ctrl_read16(host, CTL_SDIF_MODE));



	sd_scc_write32(host, priv, SH_MOBILE_SDHI_SCC_DT2FF,
@@ -529,7 +532,7 @@ static void renesas_sdhi_reset_hs400_mode(struct tmio_mmc_host *host, 
			sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));



	/* Reset HS400 mode */

	sd_ctrl_write16(host, CTL_SDIF_MODE, ~0x0001 &

	sd_ctrl_write16(host, CTL_SDIF_MODE, ~SDIF_MODE_HS400 &

			sd_ctrl_read16(host, CTL_SDIF_MODE));



	sd_scc_write32(host, priv, SH_MOBILE_SDHI_SCC_DT2FF, priv->scc_tappos);

drivers/mmc/host/tmio_mmc.h

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#define CTL_DMA_ENABLE 0xd8

#define CTL_RESET_SD 0xe0

#define CTL_VERSION 0xe2

#define CTL_SDIF_MODE 0xe6



/* Definitions for values the CTL_STOP_INTERNAL_ACTION register can take */

#define TMIO_STOP_STP		BIT(0)