Commit 83e95351 authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson

mmc: tmio: use CTL_STATUS consistently

To prevent confusion, use the virtual u32 CTL_STATUS in card_busy() the
same way as in other parts of this driver.
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 2cafc5cb
...@@ -67,14 +67,13 @@ ...@@ -67,14 +67,13 @@
#define TMIO_STAT_RXOVERFLOW BIT(20) #define TMIO_STAT_RXOVERFLOW BIT(20)
#define TMIO_STAT_TXUNDERRUN BIT(21) #define TMIO_STAT_TXUNDERRUN BIT(21)
#define TMIO_STAT_CMDTIMEOUT BIT(22) #define TMIO_STAT_CMDTIMEOUT BIT(22)
#define TMIO_STAT_DAT0 BIT(23) /* only known on R-Car so far */
#define TMIO_STAT_RXRDY BIT(24) #define TMIO_STAT_RXRDY BIT(24)
#define TMIO_STAT_TXRQ BIT(25) #define TMIO_STAT_TXRQ BIT(25)
#define TMIO_STAT_ILL_FUNC BIT(29) #define TMIO_STAT_ILL_FUNC BIT(29)
#define TMIO_STAT_CMD_BUSY BIT(30) #define TMIO_STAT_CMD_BUSY BIT(30)
#define TMIO_STAT_ILL_ACCESS BIT(31) #define TMIO_STAT_ILL_ACCESS BIT(31)
#define TMIO_STATUS2_DAT0 BIT(7)
#define CLK_CTL_DIV_MASK 0xff #define CLK_CTL_DIV_MASK 0xff
#define CLK_CTL_SCLKEN BIT(8) #define CLK_CTL_SCLKEN BIT(8)
......
...@@ -964,7 +964,7 @@ static int tmio_mmc_card_busy(struct mmc_host *mmc) ...@@ -964,7 +964,7 @@ static int tmio_mmc_card_busy(struct mmc_host *mmc)
{ {
struct tmio_mmc_host *host = mmc_priv(mmc); struct tmio_mmc_host *host = mmc_priv(mmc);
return !(sd_ctrl_read16_and_16_as_32(host, CTL_STATUS2) & TMIO_STATUS2_DAT0); return !(sd_ctrl_read16_and_16_as_32(host, CTL_STATUS) & TMIO_STAT_DAT0);
} }
static struct mmc_host_ops tmio_mmc_ops = { static struct mmc_host_ops tmio_mmc_ops = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment