Commit 1970701f authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: tmio: introduce mask for 'always 1' bits 



Some variants (namely Renesas SDHI) have bits in the STATS and IRQ_MASK
registers which are 'always 1' and should be written as such. Introduce
a seperate mask for this and apply it whenever such a register is
written.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Reviewed-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 0f4e2054

drivers/mmc/host/renesas_sdhi_core.c

+1 −0
Original line number Diff line number Diff line
@@ -722,6 +722,7 @@ int renesas_sdhi_probe(struct platform_device *pdev, 
		host->ops.card_busy = renesas_sdhi_card_busy;

		host->ops.start_signal_voltage_switch =

			renesas_sdhi_start_signal_voltage_switch;

		host->sdcard_irq_setbit_mask = TMIO_STAT_ALWAYS_SET_27;

	}



	/* Orginally registers were 16 bit apart, could be 32 or 64 nowadays */

drivers/mmc/host/tmio_mmc.h

+5 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ 
#define TMIO_STAT_DAT0		BIT(23)	/* only known on R-Car so far */

#define TMIO_STAT_RXRDY         BIT(24)

#define TMIO_STAT_TXRQ          BIT(25)

#define TMIO_STAT_ALWAYS_SET_27	BIT(27) /* only known on R-Car 2+ so far */

#define TMIO_STAT_ILL_FUNC      BIT(29) /* only when !TMIO_MMC_HAS_IDLE_WAIT */

#define TMIO_STAT_SCLKDIVEN     BIT(29) /* only when TMIO_MMC_HAS_IDLE_WAIT */

#define TMIO_STAT_CMD_BUSY      BIT(30)
@@ -154,6 +155,7 @@ struct tmio_mmc_host { 
	u32			sdcard_irq_mask;

	u32			sdio_irq_mask;

	unsigned int		clk_cache;

	u32			sdcard_irq_setbit_mask;



	spinlock_t		lock;		/* protect host private data */

	unsigned long		last_req_ts;
@@ -268,6 +270,9 @@ static inline void sd_ctrl_write16_rep(struct tmio_mmc_host *host, int addr, 
static inline void sd_ctrl_write32_as_16_and_16(struct tmio_mmc_host *host,

						int addr, u32 val)

{

	if (addr == CTL_IRQ_MASK || addr == CTL_STATUS)

		val |= host->sdcard_irq_setbit_mask;



	iowrite16(val & 0xffff, host->ctl + (addr << host->bus_shift));

	iowrite16(val >> 16, host->ctl + ((addr + 2) << host->bus_shift));

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE