Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

mmc: tmio/sdhi: distinguish between SCLKDIVEN and ILL_FUNC 



This bit has a different meaning in SDHI and original TMIO. Document
that and use the proper naming.

Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 83e95351

drivers/mmc/host/sh_mobile_sdhi.c

+2 −1
Original line number Diff line number Diff line
@@ -244,7 +244,8 @@ static int sh_mobile_sdhi_wait_idle(struct tmio_mmc_host *host) 
{

	int timeout = 1000;



	while (--timeout && !(sd_ctrl_read16(host, CTL_STATUS2) & (1 << 13)))

	while (--timeout && !(sd_ctrl_read16_and_16_as_32(host, CTL_STATUS)

			      & TMIO_STAT_SCLKDIVEN))

		udelay(1);



	if (!timeout) {

drivers/mmc/host/tmio_mmc.h

+2 −1
Original line number Diff line number Diff line
@@ -70,7 +70,8 @@ 
#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_ILL_FUNC      BIT(29)

#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)

#define TMIO_STAT_ILL_ACCESS    BIT(31)

drivers/mmc/host/tmio_mmc_pio.c

+1 −1
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ static void tmio_mmc_data_irq(struct tmio_mmc_host *host) 
		 * waiting for one more interrupt fixes the problem.

		 */

		if (host->pdata->flags & TMIO_MMC_HAS_IDLE_WAIT) {

			if (status & TMIO_STAT_ILL_FUNC)

			if (status & TMIO_STAT_SCLKDIVEN)

				done = true;

		} else {

			if (!(status & TMIO_STAT_CMD_BUSY))